diff --git a/src/app/app.ts b/src/app/app.ts
index b1a93777..8f8b806e 100644
--- a/src/app/app.ts
+++ b/src/app/app.ts
@@ -5,6 +5,7 @@ import { Scheduler } from "../component/scheduler";
 import { TemplateSet, TemplateSetConfig } from "./template_set";
 import { nodeErrorHandlers } from "../component/error_handling";
 import { validateTarget } from "../utils";
+import { validateProps } from "./template_helpers";
 
 // reimplement dev mode stuff see last change in 0f7a8289a6fb8387c3c1af41c6664b2a8448758f
 
@@ -64,7 +65,7 @@ export class App<
   mount(target: HTMLElement, options?: MountOptions): Promise<Component<P, E> & InstanceType<T>> {
     App.validateTarget(target);
     if (this.dev) {
-      this.helpers.validateProps(this.Root, this.props, { __owl__: { app: this } });
+      validateProps(this.Root, this.props, { __owl__: { app: this } });
     }
     const node = this.makeNode(this.Root, this.props);
     const prom = this.mountNode(node, target, options);
diff --git a/src/app/template_helpers.ts b/src/app/template_helpers.ts
index ddac172c..02933bb0 100644
--- a/src/app/template_helpers.ts
+++ b/src/app/template_helpers.ts
@@ -2,7 +2,8 @@ import { BDom, multi, text, toggler, createCatcher } from "../blockdom";
 import { Markup } from "../utils";
 import { html } from "../blockdom/index";
 import { isOptional, validateSchema } from "../validation";
-import { ComponentConstructor } from "../component/component";
+import type { ComponentConstructor } from "../component/component";
+import { markRaw } from "../reactivity";
 
 /**
  * This file contains utility functions that will be injected in each template,
@@ -246,4 +247,5 @@ export const helpers = {
   safeOutput,
   bind,
   createCatcher,
+  markRaw,
 };
diff --git a/src/app/template_set.ts b/src/app/template_set.ts
index a7e5e394..f905f64b 100644
--- a/src/app/template_set.ts
+++ b/src/app/template_set.ts
@@ -1,6 +1,5 @@
 import { createBlock, html, list, multi, text, toggler, comment } from "../blockdom";
 import { compile, Template } from "../compiler";
-import { markRaw } from "../reactivity";
 import { Portal } from "../portal";
 import { component, getCurrent } from "../component/component_node";
 import { helpers } from "./template_helpers";
@@ -38,22 +37,6 @@ function parseXML(xml: string): Document {
   return doc;
 }
 
-/**
- * Returns the helpers object that will be injected in each template closure
- * function
- */
-function makeHelpers(getTemplate: (name: string) => Template): any {
-  return Object.assign({}, helpers, {
-    Portal,
-    markRaw,
-    getTemplate,
-    call: (owner: any, subTemplate: string, ctx: any, parent: any, key: any) => {
-      const template = getTemplate(subTemplate);
-      return toggler(subTemplate, template.call(owner, ctx, parent, key));
-    },
-  });
-}
-
 export interface TemplateSetConfig {
   dev?: boolean;
   translatableAttributes?: string[];
@@ -67,7 +50,7 @@ export class TemplateSet {
   templates: { [name: string]: Template } = {};
   translateFn?: (s: string) => string;
   translatableAttributes?: string[];
-  helpers: any;
+  Portal = Portal;
 
   constructor(config: TemplateSetConfig = {}) {
     this.dev = config.dev || false;
@@ -76,7 +59,6 @@ export class TemplateSet {
     if (config.templates) {
       this.addTemplates(config.templates);
     }
-    this.helpers = makeHelpers(this.getTemplate.bind(this));
   }
 
   addTemplate(name: string, template: string | Element) {
@@ -122,7 +104,7 @@ export class TemplateSet {
       this.templates[name] = function (context, parent) {
         return templates[name].call(this, context, parent);
       };
-      const template = templateFn(bdom, this.helpers);
+      const template = templateFn(this, bdom, helpers);
       this.templates[name] = template;
     }
     return this.templates[name];
@@ -136,4 +118,9 @@ export class TemplateSet {
       translatableAttributes: this.translatableAttributes,
     });
   }
+
+  callTemplate(owner: any, subTemplate: string, ctx: any, parent: any, key: any): any {
+    const template = this.getTemplate(subTemplate);
+    return toggler(subTemplate, template.call(owner, ctx, parent, key));
+  }
 }
diff --git a/src/compiler/code_generator.ts b/src/compiler/code_generator.ts
index 4ae9dc4d..958ef0e4 100644
--- a/src/compiler/code_generator.ts
+++ b/src/compiler/code_generator.ts
@@ -987,17 +987,18 @@ export class CodeGenerator {
     const key = `key + \`${this.generateComponentKey()}\``;
     if (isDynamic) {
       const templateVar = generateId("template");
+      if (!this.staticDefs.find((d) => d.id === "call")) {
+        this.staticDefs.push({ id: "call", expr: `app.callTemplate.bind(app)` });
+      }
       this.define(templateVar, subTemplate);
       block = this.createBlock(block, "multi", ctx);
-      this.helpers.add("call");
       this.insertBlock(`call(this, ${templateVar}, ctx, node, ${key})`, block!, {
         ...ctx,
         forceNewBlock: !block,
       });
     } else {
       const id = generateId(`callTemplate_`);
-      this.helpers.add("getTemplate");
-      this.staticDefs.push({ id, expr: `getTemplate(${subTemplate})` });
+      this.staticDefs.push({ id, expr: `app.getTemplate(${subTemplate})` });
       block = this.createBlock(block, "multi", ctx);
       this.insertBlock(`${id}.call(this, ctx, node, ${key})`, block!, {
         ...ctx,
@@ -1254,7 +1255,9 @@ export class CodeGenerator {
     }
   }
   compileTPortal(ast: ASTTPortal, ctx: Context) {
-    this.helpers.add("Portal");
+    if (!this.staticDefs.find((d) => d.id === "Portal")) {
+      this.staticDefs.push({ id: "Portal", expr: `app.Portal` });
+    }
 
     let { block } = ctx;
     const name = this.compileInNewTarget("slot", ast.content, ctx);
diff --git a/src/compiler/index.ts b/src/compiler/index.ts
index a3f5d84d..74e8530b 100644
--- a/src/compiler/index.ts
+++ b/src/compiler/index.ts
@@ -1,10 +1,11 @@
+import type { TemplateSet } from "../app/template_set";
 import type { BDom } from "../blockdom";
 import { CodeGenerator, Config } from "./code_generator";
 import { parse } from "./parser";
 
 export type Template = (context: any, vnode: any, key?: string) => BDom;
 
-export type TemplateFunction = (blocks: any, utils: any) => Template;
+export type TemplateFunction = (app: TemplateSet, bdom: any, helpers: any) => Template;
 
 interface CompileOptions extends Config {
   name?: string;
@@ -26,5 +27,5 @@ export function compile(
   const codeGenerator = new CodeGenerator(ast, { ...options, hasSafeContext });
   const code = codeGenerator.generateCode();
   // template function
-  return new Function("bdom, helpers", code) as TemplateFunction;
+  return new Function("app, bdom, helpers", code) as TemplateFunction;
 }
diff --git a/tests/__snapshots__/reactivity.test.ts.snap b/tests/__snapshots__/reactivity.test.ts.snap
index 64d37552..830cf371 100644
--- a/tests/__snapshots__/reactivity.test.ts.snap
+++ b/tests/__snapshots__/reactivity.test.ts.snap
@@ -47,7 +47,7 @@ exports[`Reactivity: useState concurrent renderings 3`] = `
 `;
 
 exports[`Reactivity: useState destroyed component before being mounted is inactive 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -64,7 +64,7 @@ exports[`Reactivity: useState destroyed component before being mounted is inacti
 `;
 
 exports[`Reactivity: useState destroyed component before being mounted is inactive 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -78,7 +78,7 @@ exports[`Reactivity: useState destroyed component before being mounted is inacti
 `;
 
 exports[`Reactivity: useState destroyed component is inactive 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -95,7 +95,7 @@ exports[`Reactivity: useState destroyed component is inactive 1`] = `
 `;
 
 exports[`Reactivity: useState destroyed component is inactive 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -109,7 +109,7 @@ exports[`Reactivity: useState destroyed component is inactive 2`] = `
 `;
 
 exports[`Reactivity: useState one components can subscribe twice to same context 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -124,7 +124,7 @@ exports[`Reactivity: useState one components can subscribe twice to same context
 `;
 
 exports[`Reactivity: useState parent and children subscribed to same context 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -139,7 +139,7 @@ exports[`Reactivity: useState parent and children subscribed to same context 1`]
 `;
 
 exports[`Reactivity: useState parent and children subscribed to same context 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -216,7 +216,7 @@ exports[`Reactivity: useState several nodes on different level use same context
 `;
 
 exports[`Reactivity: useState two components are updated in parallel 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -231,7 +231,7 @@ exports[`Reactivity: useState two components are updated in parallel 1`] = `
 `;
 
 exports[`Reactivity: useState two components are updated in parallel 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -245,7 +245,7 @@ exports[`Reactivity: useState two components are updated in parallel 2`] = `
 `;
 
 exports[`Reactivity: useState two components can subscribe to same context 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -260,7 +260,7 @@ exports[`Reactivity: useState two components can subscribe to same context 1`] =
 `;
 
 exports[`Reactivity: useState two components can subscribe to same context 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -274,7 +274,7 @@ exports[`Reactivity: useState two components can subscribe to same context 2`] =
 `;
 
 exports[`Reactivity: useState two independent components on different levels are updated in parallel 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -289,7 +289,7 @@ exports[`Reactivity: useState two independent components on different levels are
 `;
 
 exports[`Reactivity: useState two independent components on different levels are updated in parallel 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -303,7 +303,7 @@ exports[`Reactivity: useState two independent components on different levels are
 `;
 
 exports[`Reactivity: useState two independent components on different levels are updated in parallel 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -317,7 +317,7 @@ exports[`Reactivity: useState two independent components on different levels are
 `;
 
 exports[`Reactivity: useState useContext=useState hook is reactive, for one component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -331,7 +331,7 @@ exports[`Reactivity: useState useContext=useState hook is reactive, for one comp
 `;
 
 exports[`Reactivity: useState useless atoms should be deleted 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -356,7 +356,7 @@ exports[`Reactivity: useState useless atoms should be deleted 1`] = `
 `;
 
 exports[`Reactivity: useState useless atoms should be deleted 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -370,7 +370,7 @@ exports[`Reactivity: useState useless atoms should be deleted 2`] = `
 `;
 
 exports[`Reactivity: useState very simple use, with initial value 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/app/__snapshots__/app.test.ts.snap b/tests/app/__snapshots__/app.test.ts.snap
index 6945d47a..55aa6434 100644
--- a/tests/app/__snapshots__/app.test.ts.snap
+++ b/tests/app/__snapshots__/app.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`app App supports env with getters/setters 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -16,7 +16,7 @@ exports[`app App supports env with getters/setters 1`] = `
 `;
 
 exports[`app can configure an app with props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -30,7 +30,7 @@ exports[`app can configure an app with props 1`] = `
 `;
 
 exports[`app destroy remove the widget from the DOM 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -43,7 +43,7 @@ exports[`app destroy remove the widget from the DOM 1`] = `
 `;
 
 exports[`app warnIfNoStaticProps works as expected 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/attributes.test.ts.snap b/tests/compiler/__snapshots__/attributes.test.ts.snap
index f45678ad..381886e8 100644
--- a/tests/compiler/__snapshots__/attributes.test.ts.snap
+++ b/tests/compiler/__snapshots__/attributes.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`attributes changing a class with t-att-class (preexisting class 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -15,7 +15,7 @@ exports[`attributes changing a class with t-att-class (preexisting class 1`] = `
 `;
 
 exports[`attributes changing a class with t-att-class 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -29,7 +29,7 @@ exports[`attributes changing a class with t-att-class 1`] = `
 `;
 
 exports[`attributes changing an attribute with t-att- 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -43,7 +43,7 @@ exports[`attributes changing an attribute with t-att- 1`] = `
 `;
 
 exports[`attributes class and t-att-class should combine together 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -57,7 +57,7 @@ exports[`attributes class and t-att-class should combine together 1`] = `
 `;
 
 exports[`attributes class and t-attf-class with ternary operation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -71,7 +71,7 @@ exports[`attributes class and t-attf-class with ternary operation 1`] = `
 `;
 
 exports[`attributes dynamic attribute evaluating to 0 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -85,7 +85,7 @@ exports[`attributes dynamic attribute evaluating to 0 1`] = `
 `;
 
 exports[`attributes dynamic attribute falsy variable  1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -99,7 +99,7 @@ exports[`attributes dynamic attribute falsy variable  1`] = `
 `;
 
 exports[`attributes dynamic attribute with a dash 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -113,7 +113,7 @@ exports[`attributes dynamic attribute with a dash 1`] = `
 `;
 
 exports[`attributes dynamic attributes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -127,7 +127,7 @@ exports[`attributes dynamic attributes 1`] = `
 `;
 
 exports[`attributes dynamic class attribute 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -141,7 +141,7 @@ exports[`attributes dynamic class attribute 1`] = `
 `;
 
 exports[`attributes dynamic class attribute evaluating to 0 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -155,7 +155,7 @@ exports[`attributes dynamic class attribute evaluating to 0 1`] = `
 `;
 
 exports[`attributes dynamic empty class attribute 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -169,7 +169,7 @@ exports[`attributes dynamic empty class attribute 1`] = `
 `;
 
 exports[`attributes dynamic formatted attributes with a dash 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -183,7 +183,7 @@ exports[`attributes dynamic formatted attributes with a dash 1`] = `
 `;
 
 exports[`attributes dynamic undefined class attribute 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -197,7 +197,7 @@ exports[`attributes dynamic undefined class attribute 1`] = `
 `;
 
 exports[`attributes dynamic undefined generic attribute 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -211,7 +211,7 @@ exports[`attributes dynamic undefined generic attribute 1`] = `
 `;
 
 exports[`attributes fixed variable 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -225,7 +225,7 @@ exports[`attributes fixed variable 1`] = `
 `;
 
 exports[`attributes format expression 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -239,7 +239,7 @@ exports[`attributes format expression 1`] = `
 `;
 
 exports[`attributes format literal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -253,7 +253,7 @@ exports[`attributes format literal 1`] = `
 `;
 
 exports[`attributes format multiple 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -267,7 +267,7 @@ exports[`attributes format multiple 1`] = `
 `;
 
 exports[`attributes format value 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -281,7 +281,7 @@ exports[`attributes format value 1`] = `
 `;
 
 exports[`attributes from object variables set previously 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -299,7 +299,7 @@ exports[`attributes from object variables set previously 1`] = `
 `;
 
 exports[`attributes from variables set previously (no external node) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -317,7 +317,7 @@ exports[`attributes from variables set previously (no external node) 1`] = `
 `;
 
 exports[`attributes from variables set previously 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -335,7 +335,7 @@ exports[`attributes from variables set previously 1`] = `
 `;
 
 exports[`attributes object 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -349,7 +349,7 @@ exports[`attributes object 1`] = `
 `;
 
 exports[`attributes static attributes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -362,7 +362,7 @@ exports[`attributes static attributes 1`] = `
 `;
 
 exports[`attributes static attributes on void elements 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -375,7 +375,7 @@ exports[`attributes static attributes on void elements 1`] = `
 `;
 
 exports[`attributes static attributes with dashes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -388,7 +388,7 @@ exports[`attributes static attributes with dashes 1`] = `
 `;
 
 exports[`attributes t-att-class and class should combine together 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -402,7 +402,7 @@ exports[`attributes t-att-class and class should combine together 1`] = `
 `;
 
 exports[`attributes t-att-class with multiple classes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -416,7 +416,7 @@ exports[`attributes t-att-class with multiple classes 1`] = `
 `;
 
 exports[`attributes t-att-class with multiple classes 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -430,7 +430,7 @@ exports[`attributes t-att-class with multiple classes 2`] = `
 `;
 
 exports[`attributes t-att-class with multiple classes, some of which are duplicate 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -444,7 +444,7 @@ exports[`attributes t-att-class with multiple classes, some of which are duplica
 `;
 
 exports[`attributes t-att-class with object 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -458,7 +458,7 @@ exports[`attributes t-att-class with object 1`] = `
 `;
 
 exports[`attributes t-attf-class 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -472,7 +472,7 @@ exports[`attributes t-attf-class 1`] = `
 `;
 
 exports[`attributes t-attf-class should combine with class 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -486,7 +486,7 @@ exports[`attributes t-attf-class should combine with class 1`] = `
 `;
 
 exports[`attributes t-attf-class with multiple classes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -500,7 +500,7 @@ exports[`attributes t-attf-class with multiple classes 1`] = `
 `;
 
 exports[`attributes t-attf-class with multiple classes separated by multiple spaces 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -514,7 +514,7 @@ exports[`attributes t-attf-class with multiple classes separated by multiple spa
 `;
 
 exports[`attributes tuple literal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -528,7 +528,7 @@ exports[`attributes tuple literal 1`] = `
 `;
 
 exports[`attributes tuple variable 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -542,7 +542,7 @@ exports[`attributes tuple variable 1`] = `
 `;
 
 exports[`attributes two classes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -555,7 +555,7 @@ exports[`attributes two classes 1`] = `
 `;
 
 exports[`attributes two dynamic attributes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -570,7 +570,7 @@ exports[`attributes two dynamic attributes 1`] = `
 `;
 
 exports[`attributes updating classes (with obj notation) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -584,7 +584,7 @@ exports[`attributes updating classes (with obj notation) 1`] = `
 `;
 
 exports[`attributes various escapes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -600,7 +600,7 @@ exports[`attributes various escapes 1`] = `
 `;
 
 exports[`attributes various escapes 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -613,7 +613,7 @@ exports[`attributes various escapes 2 1`] = `
 `;
 
 exports[`special cases for some specific html attributes/properties input of type checkbox with t-att-indeterminate 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -627,7 +627,7 @@ exports[`special cases for some specific html attributes/properties input of typ
 `;
 
 exports[`special cases for some specific html attributes/properties input type= checkbox, with t-att-checked 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -641,7 +641,7 @@ exports[`special cases for some specific html attributes/properties input type=
 `;
 
 exports[`special cases for some specific html attributes/properties input with t-att-value 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -655,7 +655,7 @@ exports[`special cases for some specific html attributes/properties input with t
 `;
 
 exports[`special cases for some specific html attributes/properties select with t-att-value 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -669,7 +669,7 @@ exports[`special cases for some specific html attributes/properties select with
 `;
 
 exports[`special cases for some specific html attributes/properties textarea with t-att-value 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -683,7 +683,7 @@ exports[`special cases for some specific html attributes/properties textarea wit
 `;
 
 exports[`special cases for some specific html attributes/properties various boolean html attributes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/comments.test.ts.snap b/tests/compiler/__snapshots__/comments.test.ts.snap
index 962026b2..2256a692 100644
--- a/tests/compiler/__snapshots__/comments.test.ts.snap
+++ b/tests/compiler/__snapshots__/comments.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`comments only a comment 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -12,7 +12,7 @@ exports[`comments only a comment 1`] = `
 `;
 
 exports[`comments properly handle comments 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -25,7 +25,7 @@ exports[`comments properly handle comments 1`] = `
 `;
 
 exports[`comments properly handle comments between t-if/t-else 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/event_handling.test.ts.snap b/tests/compiler/__snapshots__/event_handling.test.ts.snap
index cb43eb5d..dcf4dd4f 100644
--- a/tests/compiler/__snapshots__/event_handling.test.ts.snap
+++ b/tests/compiler/__snapshots__/event_handling.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-on can bind event handler 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -15,7 +15,7 @@ exports[`t-on can bind event handler 1`] = `
 `;
 
 exports[`t-on can bind handlers with arguments 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -30,7 +30,7 @@ exports[`t-on can bind handlers with arguments 1`] = `
 `;
 
 exports[`t-on can bind handlers with empty  object 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -45,7 +45,7 @@ exports[`t-on can bind handlers with empty  object 1`] = `
 `;
 
 exports[`t-on can bind handlers with empty object (with non empty inner string) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -60,7 +60,7 @@ exports[`t-on can bind handlers with empty object (with non empty inner string)
 `;
 
 exports[`t-on can bind handlers with empty object (with non empty inner string) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -87,7 +87,7 @@ exports[`t-on can bind handlers with empty object (with non empty inner string)
 `;
 
 exports[`t-on can bind handlers with object arguments 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -102,7 +102,7 @@ exports[`t-on can bind handlers with object arguments 1`] = `
 `;
 
 exports[`t-on can bind two event handlers 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -117,7 +117,7 @@ exports[`t-on can bind two event handlers 1`] = `
 `;
 
 exports[`t-on handler is bound to proper owner 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -131,7 +131,7 @@ exports[`t-on handler is bound to proper owner 1`] = `
 `;
 
 exports[`t-on handler is bound to proper owner, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -153,11 +153,10 @@ exports[`t-on handler is bound to proper owner, part 2 1`] = `
 `;
 
 exports[`t-on handler is bound to proper owner, part 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   return function template(ctx, node, key = \\"\\") {
     return callTemplate_1.call(this, ctx, node, key + \`__1\`);
@@ -166,7 +165,7 @@ exports[`t-on handler is bound to proper owner, part 3 1`] = `
 `;
 
 exports[`t-on handler is bound to proper owner, part 3 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -180,11 +179,11 @@ exports[`t-on handler is bound to proper owner, part 3 2`] = `
 `;
 
 exports[`t-on handler is bound to proper owner, part 4 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { prepareList, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   return function template(ctx, node, key = \\"\\") {
     ctx = Object.create(ctx);
@@ -204,7 +203,7 @@ exports[`t-on handler is bound to proper owner, part 4 1`] = `
 `;
 
 exports[`t-on handler is bound to proper owner, part 4 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -218,7 +217,7 @@ exports[`t-on handler is bound to proper owner, part 4 2`] = `
 `;
 
 exports[`t-on receive event in first argument 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -232,7 +231,7 @@ exports[`t-on receive event in first argument 1`] = `
 `;
 
 exports[`t-on t-on modifiers (native listener) basic support for native listener 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -247,7 +246,7 @@ exports[`t-on t-on modifiers (native listener) basic support for native listener
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on combined with t-esc 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -262,7 +261,7 @@ exports[`t-on t-on modifiers (native listener) t-on combined with t-esc 1`] = `
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on combined with t-out 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -278,7 +277,7 @@ exports[`t-on t-on modifiers (native listener) t-on combined with t-out 1`] = `
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on with .capture modifier 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -293,7 +292,7 @@ exports[`t-on t-on modifiers (native listener) t-on with .capture modifier 1`] =
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on with empty handler (only modifiers) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -307,7 +306,7 @@ exports[`t-on t-on modifiers (native listener) t-on with empty handler (only mod
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on with prevent and self modifiers (order matters) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -321,7 +320,7 @@ exports[`t-on t-on modifiers (native listener) t-on with prevent and self modifi
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on with prevent and/or stop modifiers 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -337,7 +336,7 @@ exports[`t-on t-on modifiers (native listener) t-on with prevent and/or stop mod
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on with prevent modifier in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -364,7 +363,7 @@ exports[`t-on t-on modifiers (native listener) t-on with prevent modifier in t-f
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on with self and prevent modifiers (order matters) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -378,7 +377,7 @@ exports[`t-on t-on modifiers (native listener) t-on with self and prevent modifi
 `;
 
 exports[`t-on t-on modifiers (native listener) t-on with self modifier 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -393,7 +392,7 @@ exports[`t-on t-on modifiers (native listener) t-on with self modifier 1`] = `
 `;
 
 exports[`t-on t-on modifiers (synthetic listener) basic support for synthetic 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -408,7 +407,7 @@ exports[`t-on t-on modifiers (synthetic listener) basic support for synthetic 1`
 `;
 
 exports[`t-on t-on with inline statement (function call) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -423,7 +422,7 @@ exports[`t-on t-on with inline statement (function call) 1`] = `
 `;
 
 exports[`t-on t-on with inline statement 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -438,7 +437,7 @@ exports[`t-on t-on with inline statement 1`] = `
 `;
 
 exports[`t-on t-on with inline statement, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -453,7 +452,7 @@ exports[`t-on t-on with inline statement, part 2 1`] = `
 `;
 
 exports[`t-on t-on with inline statement, part 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -469,11 +468,10 @@ exports[`t-on t-on with inline statement, part 3 1`] = `
 `;
 
 exports[`t-on t-on with t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -485,7 +483,7 @@ exports[`t-on t-on with t-call 1`] = `
 `;
 
 exports[`t-on t-on with t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -499,11 +497,10 @@ exports[`t-on t-on with t-call 2`] = `
 `;
 
 exports[`t-on t-on, with arguments and t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -515,7 +512,7 @@ exports[`t-on t-on, with arguments and t-call 1`] = `
 `;
 
 exports[`t-on t-on, with arguments and t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/misc.test.ts.snap b/tests/compiler/__snapshots__/misc.test.ts.snap
index 7c414086..cfe471f0 100644
--- a/tests/compiler/__snapshots__/misc.test.ts.snap
+++ b/tests/compiler/__snapshots__/misc.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`misc complex template 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -79,15 +79,15 @@ exports[`misc complex template 1`] = `
 `;
 
 exports[`misc global 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, isBoundary, withDefault, setContextValue, getTemplate, zero, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`_callee-uses-foo\`);
-  const callTemplate_2 = getTemplate(\`_callee-uses-foo\`);
-  const callTemplate_3 = getTemplate(\`_callee-uses-foo\`);
-  const callTemplate_4 = getTemplate(\`_callee-asc\`);
-  const callTemplate_5 = getTemplate(\`_callee-asc-toto\`);
+  let { prepareList, isBoundary, withDefault, setContextValue, zero, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`_callee-uses-foo\`);
+  const callTemplate_2 = app.getTemplate(\`_callee-uses-foo\`);
+  const callTemplate_3 = app.getTemplate(\`_callee-uses-foo\`);
+  const callTemplate_4 = app.getTemplate(\`_callee-asc\`);
+  const callTemplate_5 = app.getTemplate(\`_callee-asc-toto\`);
   
   let block1 = createBlock(\`<div><block-child-0/><block-child-1/></div>\`);
   let block4 = createBlock(\`<span><block-text-0/></span>\`);
@@ -131,7 +131,7 @@ exports[`misc global 1`] = `
 `;
 
 exports[`misc global 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { withDefault } = helpers;
@@ -146,7 +146,7 @@ exports[`misc global 2`] = `
 `;
 
 exports[`misc global 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -162,7 +162,7 @@ exports[`misc global 3`] = `
 `;
 
 exports[`misc global 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput, withDefault } = helpers;
@@ -178,11 +178,11 @@ exports[`misc global 4`] = `
 `;
 
 exports[`misc other complex template 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, withKey, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`LOAD_INFOS_TEMPLATE\`);
+  let { prepareList, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`LOAD_INFOS_TEMPLATE\`);
   
   let block1 = createBlock(\`<div><header><nav class=\\"navbar navbar-expand-md navbar-light bg-light\\"><a block-attribute-0=\\"href\\"><b style=\\"color:#777;\\"><block-text-1/></b></a><button type=\\"button\\" class=\\"navbar-toggler\\" data-toggle=\\"collapse\\" data-target=\\"#top_menu_collapse\\"><span class=\\"navbar-toggler-icon\\"/></button><div class=\\"collapse navbar-collapse\\" id=\\"top_menu_collapse\\" aria-expanded=\\"false\\"><ul class=\\"nav navbar-nav ml-auto text-right\\" id=\\"top_menu\\"><block-child-0/><li class=\\"nav-item divider\\"/><block-child-1/></ul><div><div class=\\"input-group input-group-sm\\"><div class=\\"input-group-prepend input-group-sm\\"><button class=\\"btn btn-default fa fa-cog\\" title=\\"Settings\\" block-handler-2=\\"click\\"/><button class=\\"btn btn-default\\" block-handler-3=\\"click\\"> More </button><block-child-2/></div><input class=\\"form-control\\" type=\\"text\\" placeholder=\\"Search\\" aria-label=\\"Search\\" name=\\"search\\" block-attribute-4=\\"value\\" block-handler-5=\\"keyup\\" block-handler-6=\\"change\\" block-ref=\\"7\\"/><div class=\\"input-group-append\\"><button class=\\"btn btn-default fa fa-eraser\\" block-handler-8=\\"click\\"/></div></div></div></div></nav></header><div class=\\"container-fluid\\" block-ref=\\"9\\"><div class=\\"row\\"><!--div class=\\"form-group col-md-6\\">
                       <h5>Search options</h5>
diff --git a/tests/compiler/__snapshots__/qweb_memory.test.ts.snap b/tests/compiler/__snapshots__/qweb_memory.test.ts.snap
index e5373afd..95a70564 100644
--- a/tests/compiler/__snapshots__/qweb_memory.test.ts.snap
+++ b/tests/compiler/__snapshots__/qweb_memory.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`memory t-foreach does not leak stuff in global scope 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
diff --git a/tests/compiler/__snapshots__/simple_templates.test.ts.snap b/tests/compiler/__snapshots__/simple_templates.test.ts.snap
index ecfa4aeb..64592ff7 100644
--- a/tests/compiler/__snapshots__/simple_templates.test.ts.snap
+++ b/tests/compiler/__snapshots__/simple_templates.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`simple templates, mostly static can render a table row 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -14,7 +14,7 @@ exports[`simple templates, mostly static can render a table row 1`] = `
 `;
 
 exports[`simple templates, mostly static div with a class attribute 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -27,7 +27,7 @@ exports[`simple templates, mostly static div with a class attribute 1`] = `
 `;
 
 exports[`simple templates, mostly static div with a class attribute with a quote 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -40,7 +40,7 @@ exports[`simple templates, mostly static div with a class attribute with a quote
 `;
 
 exports[`simple templates, mostly static div with a span child node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -53,7 +53,7 @@ exports[`simple templates, mostly static div with a span child node 1`] = `
 `;
 
 exports[`simple templates, mostly static div with an arbitrary attribute with a quote 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -66,7 +66,7 @@ exports[`simple templates, mostly static div with an arbitrary attribute with a
 `;
 
 exports[`simple templates, mostly static div with an empty class attribute 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -79,7 +79,7 @@ exports[`simple templates, mostly static div with an empty class attribute 1`] =
 `;
 
 exports[`simple templates, mostly static div with content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -92,7 +92,7 @@ exports[`simple templates, mostly static div with content 1`] = `
 `;
 
 exports[`simple templates, mostly static dom node with t-esc 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -106,7 +106,7 @@ exports[`simple templates, mostly static dom node with t-esc 1`] = `
 `;
 
 exports[`simple templates, mostly static dom node with t-esc 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -120,7 +120,7 @@ exports[`simple templates, mostly static dom node with t-esc 2`] = `
 `;
 
 exports[`simple templates, mostly static dynamic text value 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -131,7 +131,7 @@ exports[`simple templates, mostly static dynamic text value 1`] = `
 `;
 
 exports[`simple templates, mostly static empty div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -144,7 +144,7 @@ exports[`simple templates, mostly static empty div 1`] = `
 `;
 
 exports[`simple templates, mostly static empty string 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -155,7 +155,7 @@ exports[`simple templates, mostly static empty string 1`] = `
 `;
 
 exports[`simple templates, mostly static empty string in a template set 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -166,7 +166,7 @@ exports[`simple templates, mostly static empty string in a template set 1`] = `
 `;
 
 exports[`simple templates, mostly static inline template string in t-esc 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -177,7 +177,7 @@ exports[`simple templates, mostly static inline template string in t-esc 1`] = `
 `;
 
 exports[`simple templates, mostly static inline template string with content in t-esc 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -192,7 +192,7 @@ exports[`simple templates, mostly static inline template string with content in
 `;
 
 exports[`simple templates, mostly static inline template string with variable in context 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -203,7 +203,7 @@ exports[`simple templates, mostly static inline template string with variable in
 `;
 
 exports[`simple templates, mostly static multiple root nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -219,7 +219,7 @@ exports[`simple templates, mostly static multiple root nodes 1`] = `
 `;
 
 exports[`simple templates, mostly static simple string 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -230,7 +230,7 @@ exports[`simple templates, mostly static simple string 1`] = `
 `;
 
 exports[`simple templates, mostly static simple string in t tag 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -241,7 +241,7 @@ exports[`simple templates, mostly static simple string in t tag 1`] = `
 `;
 
 exports[`simple templates, mostly static static text and dynamic text (no t tag) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -254,7 +254,7 @@ exports[`simple templates, mostly static static text and dynamic text (no t tag)
 `;
 
 exports[`simple templates, mostly static static text and dynamic text 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -267,7 +267,7 @@ exports[`simple templates, mostly static static text and dynamic text 1`] = `
 `;
 
 exports[`simple templates, mostly static t-esc in dom node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -281,7 +281,7 @@ exports[`simple templates, mostly static t-esc in dom node 1`] = `
 `;
 
 exports[`simple templates, mostly static t-esc in dom node, variations 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -295,7 +295,7 @@ exports[`simple templates, mostly static t-esc in dom node, variations 1`] = `
 `;
 
 exports[`simple templates, mostly static t-esc in dom node, variations 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -309,7 +309,7 @@ exports[`simple templates, mostly static t-esc in dom node, variations 2`] = `
 `;
 
 exports[`simple templates, mostly static template with multiple t tag with multiple content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -325,7 +325,7 @@ exports[`simple templates, mostly static template with multiple t tag with multi
 `;
 
 exports[`simple templates, mostly static template with t tag with multiple content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -342,7 +342,7 @@ exports[`simple templates, mostly static template with t tag with multiple conte
 `;
 
 exports[`simple templates, mostly static two t-escs next to each other 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -355,7 +355,7 @@ exports[`simple templates, mostly static two t-escs next to each other 1`] = `
 `;
 
 exports[`simple templates, mostly static two t-escs next to each other 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -368,7 +368,7 @@ exports[`simple templates, mostly static two t-escs next to each other 2`] = `
 `;
 
 exports[`simple templates, mostly static two t-escs next to each other, in a div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/svg.test.ts.snap b/tests/compiler/__snapshots__/svg.test.ts.snap
index 0dc8d140..9f97acc4 100644
--- a/tests/compiler/__snapshots__/svg.test.ts.snap
+++ b/tests/compiler/__snapshots__/svg.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`properly support svg add proper namespace to g tags 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -14,7 +14,7 @@ exports[`properly support svg add proper namespace to g tags 1`] = `
 `;
 
 exports[`properly support svg add proper namespace to svg 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -27,7 +27,7 @@ exports[`properly support svg add proper namespace to svg 1`] = `
 `;
 
 exports[`properly support svg namespace to g tags not added if already in svg namespace 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -40,7 +40,7 @@ exports[`properly support svg namespace to g tags not added if already in svg na
 `;
 
 exports[`properly support svg namespace to svg tags added even if already in svg namespace 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -53,7 +53,7 @@ exports[`properly support svg namespace to svg tags added even if already in svg
 `;
 
 exports[`properly support svg svg creates new block if it is within html -- 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -73,7 +73,7 @@ exports[`properly support svg svg creates new block if it is within html -- 2 1`
 `;
 
 exports[`properly support svg svg creates new block if it is within html 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -88,11 +88,10 @@ exports[`properly support svg svg creates new block if it is within html 1`] = `
 `;
 
 exports[`properly support svg svg namespace added to sub templates if root tag is path 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`path\`);
+  const callTemplate_1 = app.getTemplate(\`path\`);
   
   let block1 = createBlock(\`<svg block-ns=\\"http://www.w3.org/2000/svg\\"><block-child-0/></svg>\`);
   
@@ -104,7 +103,7 @@ exports[`properly support svg svg namespace added to sub templates if root tag i
 `;
 
 exports[`properly support svg svg namespace added to sub templates if root tag is path 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -117,7 +116,7 @@ exports[`properly support svg svg namespace added to sub templates if root tag i
 `;
 
 exports[`properly support svg svg namespace added to sub-blocks 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/t_call.test.ts.snap b/tests/compiler/__snapshots__/t_call.test.ts.snap
index df7c7cdd..c32e121b 100644
--- a/tests/compiler/__snapshots__/t_call.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_call.test.ts.snap
@@ -1,11 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-call (template calling) basic caller 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`_basic-callee\`);
+  const callTemplate_1 = app.getTemplate(\`_basic-callee\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -17,7 +16,7 @@ exports[`t-call (template calling) basic caller 1`] = `
 `;
 
 exports[`t-call (template calling) basic caller 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -30,11 +29,10 @@ exports[`t-call (template calling) basic caller 2`] = `
 `;
 
 exports[`t-call (template calling) basic caller, no parent node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`_basic-callee\`);
+  const callTemplate_1 = app.getTemplate(\`_basic-callee\`);
   
   return function template(ctx, node, key = \\"\\") {
     return callTemplate_1.call(this, ctx, node, key + \`__1\`);
@@ -43,7 +41,7 @@ exports[`t-call (template calling) basic caller, no parent node 1`] = `
 `;
 
 exports[`t-call (template calling) basic caller, no parent node 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -56,11 +54,11 @@ exports[`t-call (template calling) basic caller, no parent node 2`] = `
 `;
 
 exports[`t-call (template calling) call with several sub nodes on same line 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block3 = createBlock(\`<span>hey</span>\`);
@@ -81,7 +79,7 @@ exports[`t-call (template calling) call with several sub nodes on same line 1`]
 `;
 
 exports[`t-call (template calling) call with several sub nodes on same line 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -96,11 +94,11 @@ exports[`t-call (template calling) call with several sub nodes on same line 2`]
 `;
 
 exports[`t-call (template calling) cascading t-call t-out='0' 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`subTemplate\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`subTemplate\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block3 = createBlock(\`<span>hey</span>\`);
@@ -121,11 +119,11 @@ exports[`t-call (template calling) cascading t-call t-out='0' 1`] = `
 `;
 
 exports[`t-call (template calling) cascading t-call t-out='0' 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`subSubTemplate\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`subSubTemplate\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block3 = createBlock(\`<span>cascade 0</span>\`);
@@ -144,11 +142,11 @@ exports[`t-call (template calling) cascading t-call t-out='0' 2`] = `
 `;
 
 exports[`t-call (template calling) cascading t-call t-out='0' 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`finalTemplate\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`finalTemplate\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block3 = createBlock(\`<span>cascade 1</span>\`);
@@ -167,7 +165,7 @@ exports[`t-call (template calling) cascading t-call t-out='0' 3`] = `
 `;
 
 exports[`t-call (template calling) cascading t-call t-out='0' 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -182,11 +180,11 @@ exports[`t-call (template calling) cascading t-call t-out='0' 4`] = `
 `;
 
 exports[`t-call (template calling) cascading t-call t-out='0', without external divs 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`subTemplate\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`subTemplate\`);
   
   let block2 = createBlock(\`<span>hey</span>\`);
   let block4 = createBlock(\`<span>yay</span>\`);
@@ -205,11 +203,11 @@ exports[`t-call (template calling) cascading t-call t-out='0', without external
 `;
 
 exports[`t-call (template calling) cascading t-call t-out='0', without external divs 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`subSubTemplate\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`subSubTemplate\`);
   
   let block2 = createBlock(\`<span>cascade 0</span>\`);
   
@@ -226,11 +224,11 @@ exports[`t-call (template calling) cascading t-call t-out='0', without external
 `;
 
 exports[`t-call (template calling) cascading t-call t-out='0', without external divs 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`finalTemplate\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`finalTemplate\`);
   
   let block2 = createBlock(\`<span>cascade 1</span>\`);
   
@@ -247,7 +245,7 @@ exports[`t-call (template calling) cascading t-call t-out='0', without external
 `;
 
 exports[`t-call (template calling) cascading t-call t-out='0', without external divs 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -263,10 +261,10 @@ exports[`t-call (template calling) cascading t-call t-out='0', without external
 `;
 
 exports[`t-call (template calling) dynamic t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { call } = helpers;
+  const call = app.callTemplate.bind(app);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -279,7 +277,7 @@ exports[`t-call (template calling) dynamic t-call 1`] = `
 `;
 
 exports[`t-call (template calling) dynamic t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -293,7 +291,7 @@ exports[`t-call (template calling) dynamic t-call 2`] = `
 `;
 
 exports[`t-call (template calling) dynamic t-call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -307,11 +305,11 @@ exports[`t-call (template calling) dynamic t-call 3`] = `
 `;
 
 exports[`t-call (template calling) inherit context 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -326,7 +324,7 @@ exports[`t-call (template calling) inherit context 1`] = `
 `;
 
 exports[`t-call (template calling) inherit context 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -337,11 +335,10 @@ exports[`t-call (template calling) inherit context 2`] = `
 `;
 
 exports[`t-call (template calling) recursive template, part 1 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`recursive\`);
+  const callTemplate_1 = app.getTemplate(\`recursive\`);
   
   let block1 = createBlock(\`<div><span>hey</span><block-child-0/></div>\`);
   
@@ -356,11 +353,11 @@ exports[`t-call (template calling) recursive template, part 1 1`] = `
 `;
 
 exports[`t-call (template calling) recursive template, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`nodeTemplate\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`nodeTemplate\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -377,11 +374,11 @@ exports[`t-call (template calling) recursive template, part 2 1`] = `
 `;
 
 exports[`t-call (template calling) recursive template, part 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, isBoundary, withDefault, setContextValue, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`nodeTemplate\`);
+  let { prepareList, isBoundary, withDefault, setContextValue, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`nodeTemplate\`);
   
   let block1 = createBlock(\`<div><p><block-text-0/></p><block-child-0/></div>\`);
   
@@ -411,11 +408,11 @@ exports[`t-call (template calling) recursive template, part 2 2`] = `
 `;
 
 exports[`t-call (template calling) recursive template, part 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`nodeTemplate\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`nodeTemplate\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -432,11 +429,11 @@ exports[`t-call (template calling) recursive template, part 3 1`] = `
 `;
 
 exports[`t-call (template calling) recursive template, part 3 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, isBoundary, withDefault, setContextValue, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`nodeTemplate\`);
+  let { prepareList, isBoundary, withDefault, setContextValue, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`nodeTemplate\`);
   
   let block1 = createBlock(\`<div><p><block-text-0/></p><block-child-0/></div>\`);
   
@@ -466,11 +463,11 @@ exports[`t-call (template calling) recursive template, part 3 2`] = `
 `;
 
 exports[`t-call (template calling) recursive template, part 4: with t-set recursive index 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`nodeTemplate\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`nodeTemplate\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -488,11 +485,11 @@ exports[`t-call (template calling) recursive template, part 4: with t-set recurs
 `;
 
 exports[`t-call (template calling) recursive template, part 4: with t-set recursive index 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, prepareList, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`nodeTemplate\`);
+  let { isBoundary, withDefault, setContextValue, prepareList, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`nodeTemplate\`);
   
   let block1 = createBlock(\`<div><p><block-text-0/> <block-text-1/></p><block-child-0/></div>\`);
   
@@ -524,11 +521,11 @@ exports[`t-call (template calling) recursive template, part 4: with t-set recurs
 `;
 
 exports[`t-call (template calling) scoped parameters 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/><block-text-0/></div>\`);
   
@@ -547,7 +544,7 @@ exports[`t-call (template calling) scoped parameters 1`] = `
 `;
 
 exports[`t-call (template calling) scoped parameters 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -558,11 +555,11 @@ exports[`t-call (template calling) scoped parameters 2`] = `
 `;
 
 exports[`t-call (template calling) scoped parameters, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/><block-text-0/></div>\`);
   
@@ -582,7 +579,7 @@ exports[`t-call (template calling) scoped parameters, part 2 1`] = `
 `;
 
 exports[`t-call (template calling) scoped parameters, part 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -593,11 +590,10 @@ exports[`t-call (template calling) scoped parameters, part 2 2`] = `
 `;
 
 exports[`t-call (template calling) t-call allowed on a non t node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -609,7 +605,7 @@ exports[`t-call (template calling) t-call allowed on a non t node 1`] = `
 `;
 
 exports[`t-call (template calling) t-call allowed on a non t node 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -622,11 +618,11 @@ exports[`t-call (template calling) t-call allowed on a non t node 2`] = `
 `;
 
 exports[`t-call (template calling) t-call with body content as root of a template 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`antony\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`antony\`);
   
   let block1 = createBlock(\`<p>antony</p>\`);
   
@@ -641,7 +637,7 @@ exports[`t-call (template calling) t-call with body content as root of a templat
 `;
 
 exports[`t-call (template calling) t-call with body content as root of a template 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -656,11 +652,10 @@ exports[`t-call (template calling) t-call with body content as root of a templat
 `;
 
 exports[`t-call (template calling) t-call with t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -675,7 +670,7 @@ exports[`t-call (template calling) t-call with t-if 1`] = `
 `;
 
 exports[`t-call (template calling) t-call with t-if 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -688,11 +683,11 @@ exports[`t-call (template calling) t-call with t-if 2`] = `
 `;
 
 exports[`t-call (template calling) t-call with t-set inside and body text content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -709,7 +704,7 @@ exports[`t-call (template calling) t-call with t-set inside and body text conten
 `;
 
 exports[`t-call (template calling) t-call with t-set inside and body text content 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -723,11 +718,11 @@ exports[`t-call (template calling) t-call with t-set inside and body text conten
 `;
 
 exports[`t-call (template calling) t-call with t-set inside and outside 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, isBoundary, withDefault, setContextValue, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { prepareList, isBoundary, withDefault, setContextValue, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -757,7 +752,7 @@ exports[`t-call (template calling) t-call with t-set inside and outside 1`] = `
 `;
 
 exports[`t-call (template calling) t-call with t-set inside and outside 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -771,11 +766,11 @@ exports[`t-call (template calling) t-call with t-set inside and outside 2`] = `
 `;
 
 exports[`t-call (template calling) t-call with t-set inside and outside. 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`main\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`main\`);
   
   let block1 = createBlock(\`<p><block-child-0/></p>\`);
   
@@ -790,11 +785,11 @@ exports[`t-call (template calling) t-call with t-set inside and outside. 2 1`] =
 `;
 
 exports[`t-call (template calling) t-call with t-set inside and outside. 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, isBoundary, withDefault, setContextValue, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { prepareList, isBoundary, withDefault, setContextValue, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -824,7 +819,7 @@ exports[`t-call (template calling) t-call with t-set inside and outside. 2 2`] =
 `;
 
 exports[`t-call (template calling) t-call with t-set inside and outside. 2 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -840,12 +835,12 @@ exports[`t-call (template calling) t-call with t-set inside and outside. 2 3`] =
 `;
 
 exports[`t-call (template calling) t-call, conditional and t-set in t-call body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`callee1\`);
-  const callTemplate_2 = getTemplate(\`callee2\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`callee1\`);
+  const callTemplate_2 = app.getTemplate(\`callee2\`);
   
   let block1 = createBlock(\`<div><block-child-0/><block-child-1/></div>\`);
   
@@ -869,7 +864,7 @@ exports[`t-call (template calling) t-call, conditional and t-set in t-call body
 `;
 
 exports[`t-call (template calling) t-call, conditional and t-set in t-call body 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -882,7 +877,7 @@ exports[`t-call (template calling) t-call, conditional and t-set in t-call body
 `;
 
 exports[`t-call (template calling) t-call, conditional and t-set in t-call body 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -896,11 +891,11 @@ exports[`t-call (template calling) t-call, conditional and t-set in t-call body
 `;
 
 exports[`t-call (template calling) t-esc inside t-call, with t-set outside 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -915,7 +910,7 @@ exports[`t-call (template calling) t-esc inside t-call, with t-set outside 1`] =
 `;
 
 exports[`t-call (template calling) t-esc inside t-call, with t-set outside 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -929,11 +924,11 @@ exports[`t-call (template calling) t-esc inside t-call, with t-set outside 2`] =
 `;
 
 exports[`t-call (template calling) with unused body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   return function template(ctx, node, key = \\"\\") {
     ctx = Object.create(ctx);
@@ -946,7 +941,7 @@ exports[`t-call (template calling) with unused body 1`] = `
 `;
 
 exports[`t-call (template calling) with unused body 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -959,11 +954,11 @@ exports[`t-call (template calling) with unused body 2`] = `
 `;
 
 exports[`t-call (template calling) with unused setbody 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   return function template(ctx, node, key = \\"\\") {
     ctx = Object.create(ctx);
@@ -977,7 +972,7 @@ exports[`t-call (template calling) with unused setbody 1`] = `
 `;
 
 exports[`t-call (template calling) with unused setbody 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -990,11 +985,11 @@ exports[`t-call (template calling) with unused setbody 2`] = `
 `;
 
 exports[`t-call (template calling) with used body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   return function template(ctx, node, key = \\"\\") {
     ctx = Object.create(ctx);
@@ -1007,7 +1002,7 @@ exports[`t-call (template calling) with used body 1`] = `
 `;
 
 exports[`t-call (template calling) with used body 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -1022,11 +1017,11 @@ exports[`t-call (template calling) with used body 2`] = `
 `;
 
 exports[`t-call (template calling) with used setbody 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<span><block-child-0/></span>\`);
   
@@ -1043,7 +1038,7 @@ exports[`t-call (template calling) with used setbody 1`] = `
 `;
 
 exports[`t-call (template calling) with used setbody 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/t_debug_log.test.ts.snap b/tests/compiler/__snapshots__/t_debug_log.test.ts.snap
index 71c5bd3a..dcec4d13 100644
--- a/tests/compiler/__snapshots__/t_debug_log.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_debug_log.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`debugging t-debug 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -21,7 +21,7 @@ exports[`debugging t-debug 1`] = `
 `;
 
 exports[`debugging t-debug on sub template 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -35,11 +35,10 @@ exports[`debugging t-debug on sub template 1`] = `
 `;
 
 exports[`debugging t-debug on sub template 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -51,7 +50,7 @@ exports[`debugging t-debug on sub template 2`] = `
 `;
 
 exports[`debugging t-log 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
diff --git a/tests/compiler/__snapshots__/t_esc.test.ts.snap b/tests/compiler/__snapshots__/t_esc.test.ts.snap
index 945d489e..213e8277 100644
--- a/tests/compiler/__snapshots__/t_esc.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_esc.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-esc div with falsy values 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -19,7 +19,7 @@ exports[`t-esc div with falsy values 1`] = `
 `;
 
 exports[`t-esc escaping 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -33,7 +33,7 @@ exports[`t-esc escaping 1`] = `
 `;
 
 exports[`t-esc escaping on a node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -47,7 +47,7 @@ exports[`t-esc escaping on a node 1`] = `
 `;
 
 exports[`t-esc escaping on a node with a body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { withDefault } = helpers;
@@ -62,7 +62,7 @@ exports[`t-esc escaping on a node with a body 1`] = `
 `;
 
 exports[`t-esc escaping on a node with a body, as a default 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { withDefault } = helpers;
@@ -77,7 +77,7 @@ exports[`t-esc escaping on a node with a body, as a default 1`] = `
 `;
 
 exports[`t-esc falsy values in text nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -97,7 +97,7 @@ exports[`t-esc falsy values in text nodes 1`] = `
 `;
 
 exports[`t-esc literal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -111,7 +111,7 @@ exports[`t-esc literal 1`] = `
 `;
 
 exports[`t-esc t-esc is escaped 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue } = helpers;
@@ -134,7 +134,7 @@ exports[`t-esc t-esc is escaped 1`] = `
 `;
 
 exports[`t-esc t-esc work with spread operator 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -148,11 +148,11 @@ exports[`t-esc t-esc work with spread operator 1`] = `
 `;
 
 exports[`t-esc t-esc=0 is escaped 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block2 = createBlock(\`<p>escaped</p>\`);
@@ -169,7 +169,7 @@ exports[`t-esc t-esc=0 is escaped 1`] = `
 `;
 
 exports[`t-esc t-esc=0 is escaped 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -184,7 +184,7 @@ exports[`t-esc t-esc=0 is escaped 2`] = `
 `;
 
 exports[`t-esc variable 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/t_foreach.test.ts.snap b/tests/compiler/__snapshots__/t_foreach.test.ts.snap
index db4d6a3a..372f6dc1 100644
--- a/tests/compiler/__snapshots__/t_foreach.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_foreach.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-foreach does not pollute the rendering context 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -23,7 +23,7 @@ exports[`t-foreach does not pollute the rendering context 1`] = `
 `;
 
 exports[`t-foreach iterate on items (on a element node) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -47,7 +47,7 @@ exports[`t-foreach iterate on items (on a element node) 1`] = `
 `;
 
 exports[`t-foreach iterate on items 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -78,7 +78,7 @@ exports[`t-foreach iterate on items 1`] = `
 `;
 
 exports[`t-foreach iterate, dict param 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -109,7 +109,7 @@ exports[`t-foreach iterate, dict param 1`] = `
 `;
 
 exports[`t-foreach iterate, position 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -145,7 +145,7 @@ exports[`t-foreach iterate, position 1`] = `
 `;
 
 exports[`t-foreach simple iteration (in a node) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -167,7 +167,7 @@ exports[`t-foreach simple iteration (in a node) 1`] = `
 `;
 
 exports[`t-foreach simple iteration 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -186,7 +186,7 @@ exports[`t-foreach simple iteration 1`] = `
 `;
 
 exports[`t-foreach simple iteration with two nodes inside 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -212,11 +212,11 @@ exports[`t-foreach simple iteration with two nodes inside 1`] = `
 `;
 
 exports[`t-foreach t-call with body in t-foreach in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, isBoundary, withDefault, setContextValue, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { prepareList, isBoundary, withDefault, setContextValue, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/><span>[<block-text-0/>][<block-text-1/>][<block-text-2/>]</span></div>\`);
   let block6 = createBlock(\`<span><block-text-0/></span>\`);
@@ -265,7 +265,7 @@ exports[`t-foreach t-call with body in t-foreach in t-foreach 1`] = `
 `;
 
 exports[`t-foreach t-call with body in t-foreach in t-foreach 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -283,11 +283,11 @@ exports[`t-foreach t-call with body in t-foreach in t-foreach 2`] = `
 `;
 
 exports[`t-foreach t-call without body in t-foreach in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { prepareList, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/><span>[<block-text-0/>][<block-text-1/>][<block-text-2/>]</span></div>\`);
   let block6 = createBlock(\`<span><block-text-0/></span>\`);
@@ -330,7 +330,7 @@ exports[`t-foreach t-call without body in t-foreach in t-foreach 1`] = `
 `;
 
 exports[`t-foreach t-call without body in t-foreach in t-foreach 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -352,7 +352,7 @@ exports[`t-foreach t-call without body in t-foreach in t-foreach 2`] = `
 `;
 
 exports[`t-foreach t-foreach in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -386,7 +386,7 @@ exports[`t-foreach t-foreach in t-foreach 1`] = `
 `;
 
 exports[`t-foreach t-foreach with t-if inside (no external node) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -412,7 +412,7 @@ exports[`t-foreach t-foreach with t-if inside (no external node) 1`] = `
 `;
 
 exports[`t-foreach t-foreach with t-if inside 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -440,7 +440,7 @@ exports[`t-foreach t-foreach with t-if inside 1`] = `
 `;
 
 exports[`t-foreach t-key on t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -463,7 +463,7 @@ exports[`t-foreach t-key on t-foreach 1`] = `
 `;
 
 exports[`t-foreach throws error if invalid loop expression 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -488,7 +488,7 @@ exports[`t-foreach throws error if invalid loop expression 1`] = `
 `;
 
 exports[`t-foreach with t-memo 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
diff --git a/tests/compiler/__snapshots__/t_if.test.ts.snap b/tests/compiler/__snapshots__/t_if.test.ts.snap
index ecba4bbd..c326631c 100644
--- a/tests/compiler/__snapshots__/t_if.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_if.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-if a t-if next to a div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -19,7 +19,7 @@ exports[`t-if a t-if next to a div 1`] = `
 `;
 
 exports[`t-if a t-if with two inner nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -39,7 +39,7 @@ exports[`t-if a t-if with two inner nodes 1`] = `
 `;
 
 exports[`t-if boolean value condition elif (no outside node) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -60,7 +60,7 @@ exports[`t-if boolean value condition elif (no outside node) 1`] = `
 `;
 
 exports[`t-if boolean value condition elif 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -83,7 +83,7 @@ exports[`t-if boolean value condition elif 1`] = `
 `;
 
 exports[`t-if boolean value condition else 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -102,7 +102,7 @@ exports[`t-if boolean value condition else 1`] = `
 `;
 
 exports[`t-if boolean value condition false else 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -121,7 +121,7 @@ exports[`t-if boolean value condition false else 1`] = `
 `;
 
 exports[`t-if boolean value condition missing 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -138,7 +138,7 @@ exports[`t-if boolean value condition missing 1`] = `
 `;
 
 exports[`t-if can use some boolean operators in expressions 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -176,7 +176,7 @@ exports[`t-if can use some boolean operators in expressions 1`] = `
 `;
 
 exports[`t-if div containing a t-if with two inner nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -197,7 +197,7 @@ exports[`t-if div containing a t-if with two inner nodes 1`] = `
 `;
 
 exports[`t-if dynamic content after t-if with two children nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -219,7 +219,7 @@ exports[`t-if dynamic content after t-if with two children nodes 1`] = `
 `;
 
 exports[`t-if just a t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -234,7 +234,7 @@ exports[`t-if just a t-if 1`] = `
 `;
 
 exports[`t-if simple t-if/t-else 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -251,7 +251,7 @@ exports[`t-if simple t-if/t-else 1`] = `
 `;
 
 exports[`t-if simple t-if/t-else in a div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -270,7 +270,7 @@ exports[`t-if simple t-if/t-else in a div 1`] = `
 `;
 
 exports[`t-if t-esc with t-elif 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -289,7 +289,7 @@ exports[`t-if t-esc with t-elif 1`] = `
 `;
 
 exports[`t-if t-esc with t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -306,7 +306,7 @@ exports[`t-if t-esc with t-if 1`] = `
 `;
 
 exports[`t-if t-if and t-else with two nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -328,7 +328,7 @@ exports[`t-if t-if and t-else with two nodes 1`] = `
 `;
 
 exports[`t-if t-if in a div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -345,7 +345,7 @@ exports[`t-if t-if in a div 1`] = `
 `;
 
 exports[`t-if t-if in a t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -367,7 +367,7 @@ exports[`t-if t-if in a t-if 1`] = `
 `;
 
 exports[`t-if t-if with empty content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -383,7 +383,7 @@ exports[`t-if t-if with empty content 1`] = `
 `;
 
 exports[`t-if t-if/t-else with more content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -402,7 +402,7 @@ exports[`t-if t-if/t-else with more content 1`] = `
 `;
 
 exports[`t-if t-set, then t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -423,7 +423,7 @@ exports[`t-if t-set, then t-if 1`] = `
 `;
 
 exports[`t-if t-set, then t-if, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -446,7 +446,7 @@ exports[`t-if t-set, then t-if, part 2 1`] = `
 `;
 
 exports[`t-if t-set, then t-if, part 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -472,7 +472,7 @@ exports[`t-if t-set, then t-if, part 3 1`] = `
 `;
 
 exports[`t-if two consecutive t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -490,7 +490,7 @@ exports[`t-if two consecutive t-if 1`] = `
 `;
 
 exports[`t-if two consecutive t-if in a div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -510,7 +510,7 @@ exports[`t-if two consecutive t-if in a div 1`] = `
 `;
 
 exports[`t-if two t-ifs next to each other 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/t_key.test.ts.snap b/tests/compiler/__snapshots__/t_key.test.ts.snap
index 54c15b53..488a3dd6 100644
--- a/tests/compiler/__snapshots__/t_key.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_key.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-key can use t-key directive on a node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -16,7 +16,7 @@ exports[`t-key can use t-key directive on a node 1`] = `
 `;
 
 exports[`t-key can use t-key directive on a node 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -31,7 +31,7 @@ exports[`t-key can use t-key directive on a node 2 1`] = `
 `;
 
 exports[`t-key can use t-key directive on a node as a function 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -46,7 +46,7 @@ exports[`t-key can use t-key directive on a node as a function 1`] = `
 `;
 
 exports[`t-key t-key directive in a list 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -70,7 +70,7 @@ exports[`t-key t-key directive in a list 1`] = `
 `;
 
 exports[`t-key t-key on sub dom node pushes a child block in its parent 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -91,7 +91,7 @@ exports[`t-key t-key on sub dom node pushes a child block in its parent 1`] = `
 `;
 
 exports[`t-key t-key on sub dom node pushes a child block in its parent 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/t_out.test.ts.snap b/tests/compiler/__snapshots__/t_out.test.ts.snap
index ef913210..ab210781 100644
--- a/tests/compiler/__snapshots__/t_out.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_out.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-out literal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -16,7 +16,7 @@ exports[`t-out literal 1`] = `
 `;
 
 exports[`t-out literal, no outside html element 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -28,11 +28,11 @@ exports[`t-out literal, no outside html element 1`] = `
 `;
 
 exports[`t-out multiple calls to t-out 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block2 = createBlock(\`<span>coucou</span>\`);
@@ -49,7 +49,7 @@ exports[`t-out multiple calls to t-out 1`] = `
 `;
 
 exports[`t-out multiple calls to t-out 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -65,7 +65,7 @@ exports[`t-out multiple calls to t-out 2`] = `
 `;
 
 exports[`t-out not escaping 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -80,11 +80,11 @@ exports[`t-out not escaping 1`] = `
 `;
 
 exports[`t-out t-out 0 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`_basic-callee\`);
+  let { isBoundary, zero } = helpers;
+  const callTemplate_1 = app.getTemplate(\`_basic-callee\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block2 = createBlock(\`<div>zero</div>\`);
@@ -101,7 +101,7 @@ exports[`t-out t-out 0 1`] = `
 `;
 
 exports[`t-out t-out 0 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { zero } = helpers;
@@ -116,7 +116,7 @@ exports[`t-out t-out 0 2`] = `
 `;
 
 exports[`t-out t-out and another sibling node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -131,7 +131,7 @@ exports[`t-out t-out and another sibling node 1`] = `
 `;
 
 exports[`t-out t-out bdom 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue, safeOutput } = helpers;
@@ -154,7 +154,7 @@ exports[`t-out t-out bdom 1`] = `
 `;
 
 exports[`t-out t-out block 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -169,7 +169,7 @@ exports[`t-out t-out block 1`] = `
 `;
 
 exports[`t-out t-out escaped 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -184,7 +184,7 @@ exports[`t-out t-out escaped 1`] = `
 `;
 
 exports[`t-out t-out markedup 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -199,7 +199,7 @@ exports[`t-out t-out markedup 1`] = `
 `;
 
 exports[`t-out t-out on a node with a body, as a default 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput, withDefault } = helpers;
@@ -215,7 +215,7 @@ exports[`t-out t-out on a node with a body, as a default 1`] = `
 `;
 
 exports[`t-out t-out on a node with a dom node in body, as a default 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput, withDefault } = helpers;
@@ -232,7 +232,7 @@ exports[`t-out t-out on a node with a dom node in body, as a default 1`] = `
 `;
 
 exports[`t-out t-out switch escaped 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -247,7 +247,7 @@ exports[`t-out t-out switch escaped 1`] = `
 `;
 
 exports[`t-out t-out switch escaped on markup 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -262,7 +262,7 @@ exports[`t-out t-out switch escaped on markup 1`] = `
 `;
 
 exports[`t-out t-out switch markup 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -277,7 +277,7 @@ exports[`t-out t-out switch markup 1`] = `
 `;
 
 exports[`t-out t-out switch markup on bdom 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue, safeOutput } = helpers;
@@ -309,7 +309,7 @@ exports[`t-out t-out switch markup on bdom 1`] = `
 `;
 
 exports[`t-out t-out switch markup on escaped 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -324,7 +324,7 @@ exports[`t-out t-out switch markup on escaped 1`] = `
 `;
 
 exports[`t-out t-out with a <t/> in body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -336,7 +336,7 @@ exports[`t-out t-out with a <t/> in body 1`] = `
 `;
 
 exports[`t-out t-out with arbitrary object 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -351,7 +351,7 @@ exports[`t-out t-out with arbitrary object 1`] = `
 `;
 
 exports[`t-out t-out with arbitrary object 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -366,7 +366,7 @@ exports[`t-out t-out with arbitrary object 2 1`] = `
 `;
 
 exports[`t-out t-out with comment 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -381,7 +381,7 @@ exports[`t-out t-out with comment 1`] = `
 `;
 
 exports[`t-out t-out with just a t-set t-value in body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -393,7 +393,7 @@ exports[`t-out t-out with just a t-set t-value in body 1`] = `
 `;
 
 exports[`t-out variable 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -408,7 +408,7 @@ exports[`t-out variable 1`] = `
 `;
 
 exports[`t-out with a String class 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -423,7 +423,7 @@ exports[`t-out with a String class 1`] = `
 `;
 
 exports[`t-out with an extended String class 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -438,7 +438,7 @@ exports[`t-out with an extended String class 1`] = `
 `;
 
 exports[`t-raw is deprecated should warn 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -453,7 +453,7 @@ exports[`t-raw is deprecated should warn 1`] = `
 `;
 
 exports[`t-raw is deprecated t-out is actually called in t-raw's place 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
diff --git a/tests/compiler/__snapshots__/t_ref.test.ts.snap b/tests/compiler/__snapshots__/t_ref.test.ts.snap
index 1caf8269..adf155b6 100644
--- a/tests/compiler/__snapshots__/t_ref.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_ref.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-ref can get a dynamic ref on a node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -17,7 +17,7 @@ exports[`t-ref can get a dynamic ref on a node 1`] = `
 `;
 
 exports[`t-ref can get a ref on a node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -32,11 +32,10 @@ exports[`t-ref can get a ref on a node 1`] = `
 `;
 
 exports[`t-ref ref in a t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -48,7 +47,7 @@ exports[`t-ref ref in a t-call 1`] = `
 `;
 
 exports[`t-ref ref in a t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -63,7 +62,7 @@ exports[`t-ref ref in a t-call 2`] = `
 `;
 
 exports[`t-ref ref in a t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -83,7 +82,7 @@ exports[`t-ref ref in a t-if 1`] = `
 `;
 
 exports[`t-ref refs in a loop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -111,7 +110,7 @@ exports[`t-ref refs in a loop 1`] = `
 `;
 
 exports[`t-ref two refs, one in a t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/t_set.test.ts.snap b/tests/compiler/__snapshots__/t_set.test.ts.snap
index b6424f9a..4e4e632d 100644
--- a/tests/compiler/__snapshots__/t_set.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_set.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-set evaluate value expression 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -19,7 +19,7 @@ exports[`t-set evaluate value expression 1`] = `
 `;
 
 exports[`t-set evaluate value expression, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -37,7 +37,7 @@ exports[`t-set evaluate value expression, part 2 1`] = `
 `;
 
 exports[`t-set set from attribute literal (no outside div) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -52,7 +52,7 @@ exports[`t-set set from attribute literal (no outside div) 1`] = `
 `;
 
 exports[`t-set set from attribute literal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -70,7 +70,7 @@ exports[`t-set set from attribute literal 1`] = `
 `;
 
 exports[`t-set set from attribute lookup 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -88,7 +88,7 @@ exports[`t-set set from attribute lookup 1`] = `
 `;
 
 exports[`t-set set from body literal (with t-if/t-else 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue } = helpers;
@@ -113,7 +113,7 @@ exports[`t-set set from body literal (with t-if/t-else 1`] = `
 `;
 
 exports[`t-set set from body literal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -128,7 +128,7 @@ exports[`t-set set from body literal 1`] = `
 `;
 
 exports[`t-set set from body lookup 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue } = helpers;
@@ -150,7 +150,7 @@ exports[`t-set set from body lookup 1`] = `
 `;
 
 exports[`t-set set from empty body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -168,7 +168,7 @@ exports[`t-set set from empty body 1`] = `
 `;
 
 exports[`t-set t-set and t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -189,7 +189,7 @@ exports[`t-set t-set and t-if 1`] = `
 `;
 
 exports[`t-set t-set body is evaluated immediately 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, LazyValue, safeOutput } = helpers;
@@ -215,11 +215,11 @@ exports[`t-set t-set body is evaluated immediately 1`] = `
 `;
 
 exports[`t-set t-set can't alter from within callee 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><p><block-text-0/></p><block-child-0/><p><block-text-1/></p></div>\`);
   
@@ -236,7 +236,7 @@ exports[`t-set t-set can't alter from within callee 1`] = `
 `;
 
 exports[`t-set t-set can't alter from within callee 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -255,11 +255,11 @@ exports[`t-set t-set can't alter from within callee 2`] = `
 `;
 
 exports[`t-set t-set can't alter in t-call body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><p><block-text-0/></p><block-child-0/><p><block-text-1/></p></div>\`);
   
@@ -280,7 +280,7 @@ exports[`t-set t-set can't alter in t-call body 1`] = `
 `;
 
 exports[`t-set t-set can't alter in t-call body 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -299,7 +299,7 @@ exports[`t-set t-set can't alter in t-call body 2`] = `
 `;
 
 exports[`t-set t-set does not modify render context existing key values 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -317,7 +317,7 @@ exports[`t-set t-set does not modify render context existing key values 1`] = `
 `;
 
 exports[`t-set t-set evaluates an expression only once 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -336,7 +336,7 @@ exports[`t-set t-set evaluates an expression only once 1`] = `
 `;
 
 exports[`t-set t-set outside modified in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, prepareList, withKey } = helpers;
@@ -366,7 +366,7 @@ exports[`t-set t-set outside modified in t-foreach 1`] = `
 `;
 
 exports[`t-set t-set outside modified in t-foreach increment-after operator 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, prepareList, withKey } = helpers;
@@ -396,7 +396,7 @@ exports[`t-set t-set outside modified in t-foreach increment-after operator 1`]
 `;
 
 exports[`t-set t-set outside modified in t-foreach increment-before operator 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, prepareList, withKey } = helpers;
@@ -426,7 +426,7 @@ exports[`t-set t-set outside modified in t-foreach increment-before operator 1`]
 `;
 
 exports[`t-set t-set should reuse variable if possible 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, prepareList, withKey } = helpers;
@@ -455,7 +455,7 @@ exports[`t-set t-set should reuse variable if possible 1`] = `
 `;
 
 exports[`t-set t-set with content and sub t-esc 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue } = helpers;
@@ -479,7 +479,7 @@ exports[`t-set t-set with content and sub t-esc 1`] = `
 `;
 
 exports[`t-set t-set with t-value (falsy) and body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, LazyValue, safeOutput } = helpers;
@@ -507,7 +507,7 @@ exports[`t-set t-set with t-value (falsy) and body 1`] = `
 `;
 
 exports[`t-set t-set with t-value (truthy) and body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, LazyValue, safeOutput } = helpers;
@@ -535,7 +535,7 @@ exports[`t-set t-set with t-value (truthy) and body 1`] = `
 `;
 
 exports[`t-set t-set, t-if, and mix of expression/body lookup, 1 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -557,7 +557,7 @@ exports[`t-set t-set, t-if, and mix of expression/body lookup, 1 1`] = `
 `;
 
 exports[`t-set t-set, t-if, and mix of expression/body lookup, 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -579,7 +579,7 @@ exports[`t-set t-set, t-if, and mix of expression/body lookup, 2 1`] = `
 `;
 
 exports[`t-set t-set, t-if, and mix of expression/body lookup, 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -600,7 +600,7 @@ exports[`t-set t-set, t-if, and mix of expression/body lookup, 3 1`] = `
 `;
 
 exports[`t-set value priority (with non text body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue } = helpers;
@@ -623,7 +623,7 @@ exports[`t-set value priority (with non text body 1`] = `
 `;
 
 exports[`t-set value priority 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
diff --git a/tests/compiler/__snapshots__/t_tag.test.ts.snap b/tests/compiler/__snapshots__/t_tag.test.ts.snap
index dc8dec2e..90bf59d6 100644
--- a/tests/compiler/__snapshots__/t_tag.test.ts.snap
+++ b/tests/compiler/__snapshots__/t_tag.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`qweb t-tag can fallback if falsy tag 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -15,7 +15,7 @@ exports[`qweb t-tag can fallback if falsy tag 1`] = `
 `;
 
 exports[`qweb t-tag can update 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -29,7 +29,7 @@ exports[`qweb t-tag can update 1`] = `
 `;
 
 exports[`qweb t-tag simple usecases 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -43,7 +43,7 @@ exports[`qweb t-tag simple usecases 1`] = `
 `;
 
 exports[`qweb t-tag simple usecases 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -57,7 +57,7 @@ exports[`qweb t-tag simple usecases 2`] = `
 `;
 
 exports[`qweb t-tag with multiple attributes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -71,7 +71,7 @@ exports[`qweb t-tag with multiple attributes 1`] = `
 `;
 
 exports[`qweb t-tag with multiple child nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -85,7 +85,7 @@ exports[`qweb t-tag with multiple child nodes 1`] = `
 `;
 
 exports[`qweb t-tag with multiple t-tag in same template 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -102,7 +102,7 @@ exports[`qweb t-tag with multiple t-tag in same template 1`] = `
 `;
 
 exports[`qweb t-tag with multiple t-tag in same template, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/template_set.test.ts.snap b/tests/compiler/__snapshots__/template_set.test.ts.snap
index 7a3581cd..597d8883 100644
--- a/tests/compiler/__snapshots__/template_set.test.ts.snap
+++ b/tests/compiler/__snapshots__/template_set.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`loading templates addTemplates does not modify its xml document in place 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -15,7 +15,7 @@ exports[`loading templates addTemplates does not modify its xml document in plac
 `;
 
 exports[`loading templates can initialize qweb with a string 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -28,7 +28,7 @@ exports[`loading templates can initialize qweb with a string 1`] = `
 `;
 
 exports[`loading templates can initialize qweb with an XMLDocument 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -41,11 +41,10 @@ exports[`loading templates can initialize qweb with an XMLDocument 1`] = `
 `;
 
 exports[`loading templates can load a few templates from a xml string 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`items\`);
+  const callTemplate_1 = app.getTemplate(\`items\`);
   
   let block1 = createBlock(\`<ul><block-child-0/></ul>\`);
   
@@ -57,7 +56,7 @@ exports[`loading templates can load a few templates from a xml string 1`] = `
 `;
 
 exports[`loading templates can load a few templates from a xml string 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -73,11 +72,10 @@ exports[`loading templates can load a few templates from a xml string 2`] = `
 `;
 
 exports[`loading templates can load a few templates from an XMLDocument 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`items\`);
+  const callTemplate_1 = app.getTemplate(\`items\`);
   
   let block1 = createBlock(\`<ul><block-child-0/></ul>\`);
   
@@ -89,7 +87,7 @@ exports[`loading templates can load a few templates from an XMLDocument 1`] = `
 `;
 
 exports[`loading templates can load a few templates from an XMLDocument 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/translation.test.ts.snap b/tests/compiler/__snapshots__/translation.test.ts.snap
index 2de6eb0e..4455ba84 100644
--- a/tests/compiler/__snapshots__/translation.test.ts.snap
+++ b/tests/compiler/__snapshots__/translation.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`translation support can set and remove translatable attributes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -14,7 +14,7 @@ exports[`translation support can set and remove translatable attributes 1`] = `
 `;
 
 exports[`translation support can translate node content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -27,7 +27,7 @@ exports[`translation support can translate node content 1`] = `
 `;
 
 exports[`translation support does not translate node content if disabled 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -40,7 +40,7 @@ exports[`translation support does not translate node content if disabled 1`] = `
 `;
 
 exports[`translation support some attributes are translated 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -53,7 +53,7 @@ exports[`translation support some attributes are translated 1`] = `
 `;
 
 exports[`translation support translation is done on the trimmed text, with extra spaces readded after 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/compiler/__snapshots__/white_space.test.ts.snap b/tests/compiler/__snapshots__/white_space.test.ts.snap
index 974e8adc..3580a25d 100644
--- a/tests/compiler/__snapshots__/white_space.test.ts.snap
+++ b/tests/compiler/__snapshots__/white_space.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`white space handling consecutives whitespaces are condensed into a single space 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -14,7 +14,7 @@ exports[`white space handling consecutives whitespaces are condensed into a sing
 `;
 
 exports[`white space handling nothing is done in pre tags 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -27,7 +27,7 @@ exports[`white space handling nothing is done in pre tags 1`] = `
 `;
 
 exports[`white space handling nothing is done in pre tags 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -42,7 +42,7 @@ exports[`white space handling nothing is done in pre tags 2`] = `
 `;
 
 exports[`white space handling nothing is done in pre tags 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -57,7 +57,7 @@ exports[`white space handling nothing is done in pre tags 3`] = `
 `;
 
 exports[`white space handling pre inside a div with a new line 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -70,7 +70,7 @@ exports[`white space handling pre inside a div with a new line 1`] = `
 `;
 
 exports[`white space handling white space only text nodes are condensed into a single space 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -83,7 +83,7 @@ exports[`white space handling white space only text nodes are condensed into a s
 `;
 
 exports[`white space handling whitespace only text nodes with newlines are removed 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/basics.test.ts.snap b/tests/components/__snapshots__/basics.test.ts.snap
index 1b03db79..6a23741d 100644
--- a/tests/components/__snapshots__/basics.test.ts.snap
+++ b/tests/components/__snapshots__/basics.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`basics GrandChild display is controlled by its GrandParent 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -13,7 +13,7 @@ exports[`basics GrandChild display is controlled by its GrandParent 1`] = `
 `;
 
 exports[`basics GrandChild display is controlled by its GrandParent 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -28,7 +28,7 @@ exports[`basics GrandChild display is controlled by its GrandParent 2`] = `
 `;
 
 exports[`basics GrandChild display is controlled by its GrandParent 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -41,7 +41,7 @@ exports[`basics GrandChild display is controlled by its GrandParent 3`] = `
 `;
 
 exports[`basics Multi root component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -58,7 +58,7 @@ exports[`basics Multi root component 1`] = `
 `;
 
 exports[`basics a class component inside a class component, no external dom 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -69,7 +69,7 @@ exports[`basics a class component inside a class component, no external dom 1`]
 `;
 
 exports[`basics a class component inside a class component, no external dom 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -82,7 +82,7 @@ exports[`basics a class component inside a class component, no external dom 2`]
 `;
 
 exports[`basics a component cannot be mounted in a detached node (even if node is detached later) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -95,7 +95,7 @@ exports[`basics a component cannot be mounted in a detached node (even if node i
 `;
 
 exports[`basics a component inside a component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -109,7 +109,7 @@ exports[`basics a component inside a component 1`] = `
 `;
 
 exports[`basics a component inside a component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -122,7 +122,7 @@ exports[`basics a component inside a component 2`] = `
 `;
 
 exports[`basics can be clicked on and updated 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -138,7 +138,7 @@ exports[`basics can be clicked on and updated 1`] = `
 `;
 
 exports[`basics can handle empty props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -152,7 +152,7 @@ exports[`basics can handle empty props 1`] = `
 `;
 
 exports[`basics can handle empty props 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -166,11 +166,10 @@ exports[`basics can handle empty props 2`] = `
 `;
 
 exports[`basics can inject values in tagged templates 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   return function template(ctx, node, key = \\"\\") {
     return callTemplate_1.call(this, ctx, node, key + \`__1\`);
@@ -179,7 +178,7 @@ exports[`basics can inject values in tagged templates 1`] = `
 `;
 
 exports[`basics can inject values in tagged templates 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -193,7 +192,7 @@ exports[`basics can inject values in tagged templates 2`] = `
 `;
 
 exports[`basics can mount a component with just some text 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -204,7 +203,7 @@ exports[`basics can mount a component with just some text 1`] = `
 `;
 
 exports[`basics can mount a component with no text 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -215,7 +214,7 @@ exports[`basics can mount a component with no text 1`] = `
 `;
 
 exports[`basics can mount a simple component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -228,7 +227,7 @@ exports[`basics can mount a simple component 1`] = `
 `;
 
 exports[`basics can mount a simple component with multiple roots 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -244,7 +243,7 @@ exports[`basics can mount a simple component with multiple roots 1`] = `
 `;
 
 exports[`basics can mount a simple component with props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -258,7 +257,7 @@ exports[`basics can mount a simple component with props 1`] = `
 `;
 
 exports[`basics child can be updated 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -269,7 +268,7 @@ exports[`basics child can be updated 1`] = `
 `;
 
 exports[`basics child can be updated 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -280,7 +279,7 @@ exports[`basics child can be updated 2`] = `
 `;
 
 exports[`basics class component with dynamic text 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -294,7 +293,7 @@ exports[`basics class component with dynamic text 1`] = `
 `;
 
 exports[`basics class parent, class child component with props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -305,7 +304,7 @@ exports[`basics class parent, class child component with props 1`] = `
 `;
 
 exports[`basics class parent, class child component with props 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -319,7 +318,7 @@ exports[`basics class parent, class child component with props 2`] = `
 `;
 
 exports[`basics component children doesn't leak (if case) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -334,7 +333,7 @@ exports[`basics component children doesn't leak (if case) 1`] = `
 `;
 
 exports[`basics component children doesn't leak (if case) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -347,7 +346,7 @@ exports[`basics component children doesn't leak (if case) 2`] = `
 `;
 
 exports[`basics component children doesn't leak (t-key case) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -359,7 +358,7 @@ exports[`basics component children doesn't leak (t-key case) 1`] = `
 `;
 
 exports[`basics component children doesn't leak (t-key case) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -372,7 +371,7 @@ exports[`basics component children doesn't leak (t-key case) 2`] = `
 `;
 
 exports[`basics component with dynamic content can be updated 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -386,7 +385,7 @@ exports[`basics component with dynamic content can be updated 1`] = `
 `;
 
 exports[`basics do not remove previously rendered dom if not necessary 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -399,7 +398,7 @@ exports[`basics do not remove previously rendered dom if not necessary 1`] = `
 `;
 
 exports[`basics do not remove previously rendered dom if not necessary, variation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -413,7 +412,7 @@ exports[`basics do not remove previously rendered dom if not necessary, variatio
 `;
 
 exports[`basics higher order components parent and child 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -424,7 +423,7 @@ exports[`basics higher order components parent and child 1`] = `
 `;
 
 exports[`basics higher order components parent and child 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -441,7 +440,7 @@ exports[`basics higher order components parent and child 2`] = `
 `;
 
 exports[`basics higher order components parent and child 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -454,7 +453,7 @@ exports[`basics higher order components parent and child 3`] = `
 `;
 
 exports[`basics higher order components parent and child 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -467,7 +466,7 @@ exports[`basics higher order components parent and child 4`] = `
 `;
 
 exports[`basics list of two sub components inside other nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -492,7 +491,7 @@ exports[`basics list of two sub components inside other nodes 1`] = `
 `;
 
 exports[`basics list of two sub components inside other nodes 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -505,7 +504,7 @@ exports[`basics list of two sub components inside other nodes 2`] = `
 `;
 
 exports[`basics parent, child and grandchild 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -516,7 +515,7 @@ exports[`basics parent, child and grandchild 1`] = `
 `;
 
 exports[`basics parent, child and grandchild 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -527,7 +526,7 @@ exports[`basics parent, child and grandchild 2`] = `
 `;
 
 exports[`basics parent, child and grandchild 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -540,7 +539,7 @@ exports[`basics parent, child and grandchild 3`] = `
 `;
 
 exports[`basics props is set on root component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -553,7 +552,7 @@ exports[`basics props is set on root component 1`] = `
 `;
 
 exports[`basics reconciliation alg is not confused in some specific situation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -569,7 +568,7 @@ exports[`basics reconciliation alg is not confused in some specific situation 1`
 `;
 
 exports[`basics reconciliation alg is not confused in some specific situation 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -582,7 +581,7 @@ exports[`basics reconciliation alg is not confused in some specific situation 2`
 `;
 
 exports[`basics rerendering a widget with a sub widget 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -593,7 +592,7 @@ exports[`basics rerendering a widget with a sub widget 1`] = `
 `;
 
 exports[`basics rerendering a widget with a sub widget 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -609,7 +608,7 @@ exports[`basics rerendering a widget with a sub widget 2`] = `
 `;
 
 exports[`basics same t-keys in two different places 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -626,7 +625,7 @@ exports[`basics same t-keys in two different places 1`] = `
 `;
 
 exports[`basics same t-keys in two different places 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -640,7 +639,7 @@ exports[`basics same t-keys in two different places 2`] = `
 `;
 
 exports[`basics simple component with a dynamic text 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -654,7 +653,7 @@ exports[`basics simple component with a dynamic text 1`] = `
 `;
 
 exports[`basics simple component, useState 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -668,7 +667,7 @@ exports[`basics simple component, useState 1`] = `
 `;
 
 exports[`basics some simple sanity checks (el/status) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -681,7 +680,7 @@ exports[`basics some simple sanity checks (el/status) 1`] = `
 `;
 
 exports[`basics sub components between t-ifs 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -707,7 +706,7 @@ exports[`basics sub components between t-ifs 1`] = `
 `;
 
 exports[`basics sub components between t-ifs 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -720,7 +719,7 @@ exports[`basics sub components between t-ifs 2`] = `
 `;
 
 exports[`basics t-elif works with t-component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -740,7 +739,7 @@ exports[`basics t-elif works with t-component 1`] = `
 `;
 
 exports[`basics t-elif works with t-component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -753,7 +752,7 @@ exports[`basics t-elif works with t-component 2`] = `
 `;
 
 exports[`basics t-else with empty string works with t-component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -773,7 +772,7 @@ exports[`basics t-else with empty string works with t-component 1`] = `
 `;
 
 exports[`basics t-else with empty string works with t-component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -786,7 +785,7 @@ exports[`basics t-else with empty string works with t-component 2`] = `
 `;
 
 exports[`basics t-else works with t-component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -806,7 +805,7 @@ exports[`basics t-else works with t-component 1`] = `
 `;
 
 exports[`basics t-else works with t-component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -819,7 +818,7 @@ exports[`basics t-else works with t-component 2`] = `
 `;
 
 exports[`basics t-if works with t-component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -836,7 +835,7 @@ exports[`basics t-if works with t-component 1`] = `
 `;
 
 exports[`basics t-if works with t-component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -849,7 +848,7 @@ exports[`basics t-if works with t-component 2`] = `
 `;
 
 exports[`basics t-key on a component with t-if, and a sibling component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -868,7 +867,7 @@ exports[`basics t-key on a component with t-if, and a sibling component 1`] = `
 `;
 
 exports[`basics t-key on a component with t-if, and a sibling component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -881,7 +880,7 @@ exports[`basics t-key on a component with t-if, and a sibling component 2`] = `
 `;
 
 exports[`basics text after a conditional component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -899,7 +898,7 @@ exports[`basics text after a conditional component 1`] = `
 `;
 
 exports[`basics text after a conditional component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -912,7 +911,7 @@ exports[`basics text after a conditional component 2`] = `
 `;
 
 exports[`basics three level of components with collapsing root nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -923,7 +922,7 @@ exports[`basics three level of components with collapsing root nodes 1`] = `
 `;
 
 exports[`basics three level of components with collapsing root nodes 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -934,7 +933,7 @@ exports[`basics three level of components with collapsing root nodes 2`] = `
 `;
 
 exports[`basics three level of components with collapsing root nodes 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -947,7 +946,7 @@ exports[`basics three level of components with collapsing root nodes 3`] = `
 `;
 
 exports[`basics two child components 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -960,7 +959,7 @@ exports[`basics two child components 1`] = `
 `;
 
 exports[`basics two child components 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -973,7 +972,7 @@ exports[`basics two child components 2`] = `
 `;
 
 exports[`basics update props of component without concrete own node 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -988,7 +987,7 @@ exports[`basics update props of component without concrete own node 1`] = `
 `;
 
 exports[`basics update props of component without concrete own node 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1000,7 +999,7 @@ exports[`basics update props of component without concrete own node 2`] = `
 `;
 
 exports[`basics update props of component without concrete own node 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1015,7 +1014,7 @@ exports[`basics update props of component without concrete own node 3`] = `
 `;
 
 exports[`basics updating a component with t-foreach as root 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -1034,7 +1033,7 @@ exports[`basics updating a component with t-foreach as root 1`] = `
 `;
 
 exports[`basics updating widget immediately 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1045,7 +1044,7 @@ exports[`basics updating widget immediately 1`] = `
 `;
 
 exports[`basics updating widget immediately 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1062,7 +1061,7 @@ exports[`basics updating widget immediately 2`] = `
 `;
 
 exports[`basics widget after a t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -1087,7 +1086,7 @@ exports[`basics widget after a t-foreach 1`] = `
 `;
 
 exports[`basics widget after a t-foreach 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1100,7 +1099,7 @@ exports[`basics widget after a t-foreach 2`] = `
 `;
 
 exports[`basics zero or one child components 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1115,7 +1114,7 @@ exports[`basics zero or one child components 1`] = `
 `;
 
 exports[`basics zero or one child components 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1128,7 +1127,7 @@ exports[`basics zero or one child components 2`] = `
 `;
 
 exports[`mount targets can mount a component (with default position='last-child') 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1141,7 +1140,7 @@ exports[`mount targets can mount a component (with default position='last-child'
 `;
 
 exports[`mount targets can mount a component (with position='first-child') 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1154,7 +1153,7 @@ exports[`mount targets can mount a component (with position='first-child') 1`] =
 `;
 
 exports[`mount targets default mount option is 'last-child' 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1167,7 +1166,7 @@ exports[`mount targets default mount option is 'last-child' 1`] = `
 `;
 
 exports[`mount targets mount function: can mount a component (with default position='last-child') 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1180,7 +1179,7 @@ exports[`mount targets mount function: can mount a component (with default posit
 `;
 
 exports[`support svg components add proper namespace to svg 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1194,7 +1193,7 @@ exports[`support svg components add proper namespace to svg 1`] = `
 `;
 
 exports[`support svg components add proper namespace to svg 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1207,7 +1206,7 @@ exports[`support svg components add proper namespace to svg 2`] = `
 `;
 
 exports[`t-out in components can render list of t-out  1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, safeOutput, withKey } = helpers;
@@ -1231,7 +1230,7 @@ exports[`t-out in components can render list of t-out  1`] = `
 `;
 
 exports[`t-out in components can switch the contents of two t-out repeatedly 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -1245,7 +1244,7 @@ exports[`t-out in components can switch the contents of two t-out repeatedly 1`]
 `;
 
 exports[`t-out in components update properly on state changes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
diff --git a/tests/components/__snapshots__/concurrency.test.ts.snap b/tests/components/__snapshots__/concurrency.test.ts.snap
index 55d79c02..6a03dd9e 100644
--- a/tests/components/__snapshots__/concurrency.test.ts.snap
+++ b/tests/components/__snapshots__/concurrency.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Cascading renders after microtaskTick 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -23,7 +23,7 @@ exports[`Cascading renders after microtaskTick 1`] = `
 `;
 
 exports[`Cascading renders after microtaskTick 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -42,7 +42,7 @@ exports[`Cascading renders after microtaskTick 2`] = `
 `;
 
 exports[`Cascading renders after microtaskTick 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -53,7 +53,7 @@ exports[`Cascading renders after microtaskTick 3`] = `
 `;
 
 exports[`another scenario with delayed rendering 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -69,7 +69,7 @@ exports[`another scenario with delayed rendering 1`] = `
 `;
 
 exports[`another scenario with delayed rendering 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -82,7 +82,7 @@ exports[`another scenario with delayed rendering 2`] = `
 `;
 
 exports[`another scenario with delayed rendering 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -97,7 +97,7 @@ exports[`another scenario with delayed rendering 3`] = `
 `;
 
 exports[`async rendering destroying a widget before start is over 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -110,7 +110,7 @@ exports[`async rendering destroying a widget before start is over 1`] = `
 `;
 
 exports[`calling render in destroy 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -122,7 +122,7 @@ exports[`calling render in destroy 1`] = `
 `;
 
 exports[`calling render in destroy 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -133,7 +133,7 @@ exports[`calling render in destroy 2`] = `
 `;
 
 exports[`calling render in destroy 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -147,7 +147,7 @@ exports[`calling render in destroy 3`] = `
 `;
 
 exports[`change state and call manually render: no unnecessary rendering 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -161,7 +161,7 @@ exports[`change state and call manually render: no unnecessary rendering 1`] = `
 `;
 
 exports[`changing state before first render does not trigger a render (with parent) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -178,7 +178,7 @@ exports[`changing state before first render does not trigger a render (with pare
 `;
 
 exports[`changing state before first render does not trigger a render (with parent) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -192,7 +192,7 @@ exports[`changing state before first render does not trigger a render (with pare
 `;
 
 exports[`changing state before first render does not trigger a render 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -206,7 +206,7 @@ exports[`changing state before first render does not trigger a render 1`] = `
 `;
 
 exports[`concurrent renderings scenario 1 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -220,7 +220,7 @@ exports[`concurrent renderings scenario 1 1`] = `
 `;
 
 exports[`concurrent renderings scenario 1 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -234,7 +234,7 @@ exports[`concurrent renderings scenario 1 2`] = `
 `;
 
 exports[`concurrent renderings scenario 1 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -249,7 +249,7 @@ exports[`concurrent renderings scenario 1 3`] = `
 `;
 
 exports[`concurrent renderings scenario 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -264,7 +264,7 @@ exports[`concurrent renderings scenario 2 1`] = `
 `;
 
 exports[`concurrent renderings scenario 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -278,7 +278,7 @@ exports[`concurrent renderings scenario 2 2`] = `
 `;
 
 exports[`concurrent renderings scenario 2 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -293,7 +293,7 @@ exports[`concurrent renderings scenario 2 3`] = `
 `;
 
 exports[`concurrent renderings scenario 2bis 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -307,7 +307,7 @@ exports[`concurrent renderings scenario 2bis 1`] = `
 `;
 
 exports[`concurrent renderings scenario 2bis 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -321,7 +321,7 @@ exports[`concurrent renderings scenario 2bis 2`] = `
 `;
 
 exports[`concurrent renderings scenario 2bis 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -336,7 +336,7 @@ exports[`concurrent renderings scenario 2bis 3`] = `
 `;
 
 exports[`concurrent renderings scenario 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -350,7 +350,7 @@ exports[`concurrent renderings scenario 3 1`] = `
 `;
 
 exports[`concurrent renderings scenario 3 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -364,7 +364,7 @@ exports[`concurrent renderings scenario 3 2`] = `
 `;
 
 exports[`concurrent renderings scenario 3 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -378,7 +378,7 @@ exports[`concurrent renderings scenario 3 3`] = `
 `;
 
 exports[`concurrent renderings scenario 3 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -393,7 +393,7 @@ exports[`concurrent renderings scenario 3 4`] = `
 `;
 
 exports[`concurrent renderings scenario 4 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -407,7 +407,7 @@ exports[`concurrent renderings scenario 4 1`] = `
 `;
 
 exports[`concurrent renderings scenario 4 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -421,7 +421,7 @@ exports[`concurrent renderings scenario 4 2`] = `
 `;
 
 exports[`concurrent renderings scenario 4 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -435,7 +435,7 @@ exports[`concurrent renderings scenario 4 3`] = `
 `;
 
 exports[`concurrent renderings scenario 4 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -450,7 +450,7 @@ exports[`concurrent renderings scenario 4 4`] = `
 `;
 
 exports[`concurrent renderings scenario 5 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -464,7 +464,7 @@ exports[`concurrent renderings scenario 5 1`] = `
 `;
 
 exports[`concurrent renderings scenario 5 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -478,7 +478,7 @@ exports[`concurrent renderings scenario 5 2`] = `
 `;
 
 exports[`concurrent renderings scenario 6 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -492,7 +492,7 @@ exports[`concurrent renderings scenario 6 1`] = `
 `;
 
 exports[`concurrent renderings scenario 6 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -506,7 +506,7 @@ exports[`concurrent renderings scenario 6 2`] = `
 `;
 
 exports[`concurrent renderings scenario 7 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -520,7 +520,7 @@ exports[`concurrent renderings scenario 7 1`] = `
 `;
 
 exports[`concurrent renderings scenario 7 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -535,7 +535,7 @@ exports[`concurrent renderings scenario 7 2`] = `
 `;
 
 exports[`concurrent renderings scenario 8 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -549,7 +549,7 @@ exports[`concurrent renderings scenario 8 1`] = `
 `;
 
 exports[`concurrent renderings scenario 8 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -564,7 +564,7 @@ exports[`concurrent renderings scenario 8 2`] = `
 `;
 
 exports[`concurrent renderings scenario 9 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -580,7 +580,7 @@ exports[`concurrent renderings scenario 9 1`] = `
 `;
 
 exports[`concurrent renderings scenario 9 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -594,7 +594,7 @@ exports[`concurrent renderings scenario 9 2`] = `
 `;
 
 exports[`concurrent renderings scenario 9 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -608,7 +608,7 @@ exports[`concurrent renderings scenario 9 3`] = `
 `;
 
 exports[`concurrent renderings scenario 9 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -623,7 +623,7 @@ exports[`concurrent renderings scenario 9 4`] = `
 `;
 
 exports[`concurrent renderings scenario 10 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -637,7 +637,7 @@ exports[`concurrent renderings scenario 10 1`] = `
 `;
 
 exports[`concurrent renderings scenario 10 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -654,7 +654,7 @@ exports[`concurrent renderings scenario 10 2`] = `
 `;
 
 exports[`concurrent renderings scenario 10 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -668,7 +668,7 @@ exports[`concurrent renderings scenario 10 3`] = `
 `;
 
 exports[`concurrent renderings scenario 11 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -682,7 +682,7 @@ exports[`concurrent renderings scenario 11 1`] = `
 `;
 
 exports[`concurrent renderings scenario 11 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -697,7 +697,7 @@ exports[`concurrent renderings scenario 11 2`] = `
 `;
 
 exports[`concurrent renderings scenario 12 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -711,7 +711,7 @@ exports[`concurrent renderings scenario 12 1`] = `
 `;
 
 exports[`concurrent renderings scenario 12 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -725,7 +725,7 @@ exports[`concurrent renderings scenario 12 2`] = `
 `;
 
 exports[`concurrent renderings scenario 13 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -743,7 +743,7 @@ exports[`concurrent renderings scenario 13 1`] = `
 `;
 
 exports[`concurrent renderings scenario 13 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -757,7 +757,7 @@ exports[`concurrent renderings scenario 13 2`] = `
 `;
 
 exports[`concurrent renderings scenario 14 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -771,7 +771,7 @@ exports[`concurrent renderings scenario 14 1`] = `
 `;
 
 exports[`concurrent renderings scenario 14 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -785,7 +785,7 @@ exports[`concurrent renderings scenario 14 2`] = `
 `;
 
 exports[`concurrent renderings scenario 14 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -801,7 +801,7 @@ exports[`concurrent renderings scenario 14 3`] = `
 `;
 
 exports[`concurrent renderings scenario 15 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -815,7 +815,7 @@ exports[`concurrent renderings scenario 15 1`] = `
 `;
 
 exports[`concurrent renderings scenario 15 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -829,7 +829,7 @@ exports[`concurrent renderings scenario 15 2`] = `
 `;
 
 exports[`concurrent renderings scenario 15 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -845,7 +845,7 @@ exports[`concurrent renderings scenario 15 3`] = `
 `;
 
 exports[`concurrent renderings scenario 16 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -856,7 +856,7 @@ exports[`concurrent renderings scenario 16 1`] = `
 `;
 
 exports[`concurrent renderings scenario 16 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -867,7 +867,7 @@ exports[`concurrent renderings scenario 16 2`] = `
 `;
 
 exports[`concurrent renderings scenario 16 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -888,7 +888,7 @@ exports[`concurrent renderings scenario 16 3`] = `
 `;
 
 exports[`concurrent renderings scenario 16 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -899,7 +899,7 @@ exports[`concurrent renderings scenario 16 4`] = `
 `;
 
 exports[`creating two async components, scenario 1 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -917,7 +917,7 @@ exports[`creating two async components, scenario 1 1`] = `
 `;
 
 exports[`creating two async components, scenario 1 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -931,7 +931,7 @@ exports[`creating two async components, scenario 1 2`] = `
 `;
 
 exports[`creating two async components, scenario 1 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -944,7 +944,7 @@ exports[`creating two async components, scenario 1 3`] = `
 `;
 
 exports[`creating two async components, scenario 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -962,7 +962,7 @@ exports[`creating two async components, scenario 2 1`] = `
 `;
 
 exports[`creating two async components, scenario 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -976,7 +976,7 @@ exports[`creating two async components, scenario 2 2`] = `
 `;
 
 exports[`creating two async components, scenario 2 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -990,7 +990,7 @@ exports[`creating two async components, scenario 2 3`] = `
 `;
 
 exports[`creating two async components, scenario 3 (patching in the same frame) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1008,7 +1008,7 @@ exports[`creating two async components, scenario 3 (patching in the same frame)
 `;
 
 exports[`creating two async components, scenario 3 (patching in the same frame) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1022,7 +1022,7 @@ exports[`creating two async components, scenario 3 (patching in the same frame)
 `;
 
 exports[`creating two async components, scenario 3 (patching in the same frame) 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1036,7 +1036,7 @@ exports[`creating two async components, scenario 3 (patching in the same frame)
 `;
 
 exports[`delay willUpdateProps 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1047,7 +1047,7 @@ exports[`delay willUpdateProps 1`] = `
 `;
 
 exports[`delay willUpdateProps 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1061,7 +1061,7 @@ exports[`delay willUpdateProps 2`] = `
 `;
 
 exports[`delay willUpdateProps with rendering grandchild 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1072,7 +1072,7 @@ exports[`delay willUpdateProps with rendering grandchild 1`] = `
 `;
 
 exports[`delay willUpdateProps with rendering grandchild 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1085,7 +1085,7 @@ exports[`delay willUpdateProps with rendering grandchild 2`] = `
 `;
 
 exports[`delay willUpdateProps with rendering grandchild 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1099,7 +1099,7 @@ exports[`delay willUpdateProps with rendering grandchild 3`] = `
 `;
 
 exports[`delay willUpdateProps with rendering grandchild 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1112,7 +1112,7 @@ exports[`delay willUpdateProps with rendering grandchild 4`] = `
 `;
 
 exports[`delayed fiber does not get rendered if it was cancelled 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1125,7 +1125,7 @@ exports[`delayed fiber does not get rendered if it was cancelled 1`] = `
 `;
 
 exports[`delayed fiber does not get rendered if it was cancelled 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1138,7 +1138,7 @@ exports[`delayed fiber does not get rendered if it was cancelled 2`] = `
 `;
 
 exports[`delayed fiber does not get rendered if it was cancelled 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1151,7 +1151,7 @@ exports[`delayed fiber does not get rendered if it was cancelled 3`] = `
 `;
 
 exports[`delayed fiber does not get rendered if it was cancelled 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1162,7 +1162,7 @@ exports[`delayed fiber does not get rendered if it was cancelled 4`] = `
 `;
 
 exports[`delayed rendering, but then initial rendering is cancelled by yet another render 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1173,7 +1173,7 @@ exports[`delayed rendering, but then initial rendering is cancelled by yet anoth
 `;
 
 exports[`delayed rendering, but then initial rendering is cancelled by yet another render 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1184,7 +1184,7 @@ exports[`delayed rendering, but then initial rendering is cancelled by yet anoth
 `;
 
 exports[`delayed rendering, but then initial rendering is cancelled by yet another render 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1200,7 +1200,7 @@ exports[`delayed rendering, but then initial rendering is cancelled by yet anoth
 `;
 
 exports[`delayed rendering, but then initial rendering is cancelled by yet another render 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1215,7 +1215,7 @@ exports[`delayed rendering, but then initial rendering is cancelled by yet anoth
 `;
 
 exports[`delayed rendering, destruction, stuff happens 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1228,7 +1228,7 @@ exports[`delayed rendering, destruction, stuff happens 1`] = `
 `;
 
 exports[`delayed rendering, destruction, stuff happens 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1244,7 +1244,7 @@ exports[`delayed rendering, destruction, stuff happens 2`] = `
 `;
 
 exports[`delayed rendering, destruction, stuff happens 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1261,7 +1261,7 @@ exports[`delayed rendering, destruction, stuff happens 3`] = `
 `;
 
 exports[`delayed rendering, destruction, stuff happens 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1278,7 +1278,7 @@ exports[`delayed rendering, destruction, stuff happens 4`] = `
 `;
 
 exports[`delayed rendering, reusing fiber and stuff 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1289,7 +1289,7 @@ exports[`delayed rendering, reusing fiber and stuff 1`] = `
 `;
 
 exports[`delayed rendering, reusing fiber and stuff 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1302,7 +1302,7 @@ exports[`delayed rendering, reusing fiber and stuff 2`] = `
 `;
 
 exports[`delayed rendering, reusing fiber and stuff 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1317,7 +1317,7 @@ exports[`delayed rendering, reusing fiber and stuff 3`] = `
 `;
 
 exports[`delayed rendering, reusing fiber then component is destroyed and  stuff 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1333,7 +1333,7 @@ exports[`delayed rendering, reusing fiber then component is destroyed and  stuff
 `;
 
 exports[`delayed rendering, reusing fiber then component is destroyed and  stuff 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1346,7 +1346,7 @@ exports[`delayed rendering, reusing fiber then component is destroyed and  stuff
 `;
 
 exports[`delayed rendering, reusing fiber then component is destroyed and  stuff 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1361,7 +1361,7 @@ exports[`delayed rendering, reusing fiber then component is destroyed and  stuff
 `;
 
 exports[`delayed rendering, then component is destroyed and  stuff 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1372,7 +1372,7 @@ exports[`delayed rendering, then component is destroyed and  stuff 1`] = `
 `;
 
 exports[`delayed rendering, then component is destroyed and  stuff 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1388,7 +1388,7 @@ exports[`delayed rendering, then component is destroyed and  stuff 2`] = `
 `;
 
 exports[`delayed rendering, then component is destroyed and  stuff 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1403,7 +1403,7 @@ exports[`delayed rendering, then component is destroyed and  stuff 3`] = `
 `;
 
 exports[`destroyed component causes other soon to be destroyed component to rerender, weird stuff happens 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1421,7 +1421,7 @@ exports[`destroyed component causes other soon to be destroyed component to rere
 `;
 
 exports[`destroyed component causes other soon to be destroyed component to rerender, weird stuff happens 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1432,7 +1432,7 @@ exports[`destroyed component causes other soon to be destroyed component to rere
 `;
 
 exports[`destroyed component causes other soon to be destroyed component to rerender, weird stuff happens 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1443,7 +1443,7 @@ exports[`destroyed component causes other soon to be destroyed component to rere
 `;
 
 exports[`destroying/recreating a subcomponent, other scenario 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1459,7 +1459,7 @@ exports[`destroying/recreating a subcomponent, other scenario 1`] = `
 `;
 
 exports[`destroying/recreating a subcomponent, other scenario 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1470,7 +1470,7 @@ exports[`destroying/recreating a subcomponent, other scenario 2`] = `
 `;
 
 exports[`destroying/recreating a subwidget with different props (if start is not over) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1487,7 +1487,7 @@ exports[`destroying/recreating a subwidget with different props (if start is not
 `;
 
 exports[`destroying/recreating a subwidget with different props (if start is not over) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1501,7 +1501,7 @@ exports[`destroying/recreating a subwidget with different props (if start is not
 `;
 
 exports[`parent and child rendered at exact same time 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1512,7 +1512,7 @@ exports[`parent and child rendered at exact same time 1`] = `
 `;
 
 exports[`parent and child rendered at exact same time 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1523,7 +1523,7 @@ exports[`parent and child rendered at exact same time 2`] = `
 `;
 
 exports[`properly behave when destroyed/unmounted while rendering  1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1540,7 +1540,7 @@ exports[`properly behave when destroyed/unmounted while rendering  1`] = `
 `;
 
 exports[`properly behave when destroyed/unmounted while rendering  2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1554,7 +1554,7 @@ exports[`properly behave when destroyed/unmounted while rendering  2`] = `
 `;
 
 exports[`properly behave when destroyed/unmounted while rendering  3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1567,7 +1567,7 @@ exports[`properly behave when destroyed/unmounted while rendering  3`] = `
 `;
 
 exports[`rendering component again in next microtick 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1585,7 +1585,7 @@ exports[`rendering component again in next microtick 1`] = `
 `;
 
 exports[`rendering component again in next microtick 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1598,7 +1598,7 @@ exports[`rendering component again in next microtick 2`] = `
 `;
 
 exports[`rendering parent twice, with different props on child and stuff 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1609,7 +1609,7 @@ exports[`rendering parent twice, with different props on child and stuff 1`] = `
 `;
 
 exports[`rendering parent twice, with different props on child and stuff 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1620,7 +1620,7 @@ exports[`rendering parent twice, with different props on child and stuff 2`] = `
 `;
 
 exports[`renderings, destruction, patch, stuff, ... yet another variation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1634,7 +1634,7 @@ exports[`renderings, destruction, patch, stuff, ... yet another variation 1`] =
 `;
 
 exports[`renderings, destruction, patch, stuff, ... yet another variation 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1650,7 +1650,7 @@ exports[`renderings, destruction, patch, stuff, ... yet another variation 2`] =
 `;
 
 exports[`renderings, destruction, patch, stuff, ... yet another variation 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1667,7 +1667,7 @@ exports[`renderings, destruction, patch, stuff, ... yet another variation 3`] =
 `;
 
 exports[`renderings, destruction, patch, stuff, ... yet another variation 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1684,7 +1684,7 @@ exports[`renderings, destruction, patch, stuff, ... yet another variation 4`] =
 `;
 
 exports[`t-foreach with dynamic async component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -1709,7 +1709,7 @@ exports[`t-foreach with dynamic async component 1`] = `
 `;
 
 exports[`t-foreach with dynamic async component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1723,7 +1723,7 @@ exports[`t-foreach with dynamic async component 2`] = `
 `;
 
 exports[`t-key on dom node having a component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1739,7 +1739,7 @@ exports[`t-key on dom node having a component 1`] = `
 `;
 
 exports[`t-key on dom node having a component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1750,7 +1750,7 @@ exports[`t-key on dom node having a component 2`] = `
 `;
 
 exports[`t-key on dynamic async component (toggler is never patched) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1763,7 +1763,7 @@ exports[`t-key on dynamic async component (toggler is never patched) 1`] = `
 `;
 
 exports[`t-key on dynamic async component (toggler is never patched) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1777,7 +1777,7 @@ exports[`t-key on dynamic async component (toggler is never patched) 2`] = `
 `;
 
 exports[`two renderings initiated between willPatch and patched 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1795,7 +1795,7 @@ exports[`two renderings initiated between willPatch and patched 1`] = `
 `;
 
 exports[`two renderings initiated between willPatch and patched 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1810,7 +1810,7 @@ exports[`two renderings initiated between willPatch and patched 2`] = `
 `;
 
 exports[`two sequential renderings before an animation frame 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1821,7 +1821,7 @@ exports[`two sequential renderings before an animation frame 1`] = `
 `;
 
 exports[`two sequential renderings before an animation frame 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1832,7 +1832,7 @@ exports[`two sequential renderings before an animation frame 2`] = `
 `;
 
 exports[`update a sub-component twice in the same frame 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1846,7 +1846,7 @@ exports[`update a sub-component twice in the same frame 1`] = `
 `;
 
 exports[`update a sub-component twice in the same frame 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1860,7 +1860,7 @@ exports[`update a sub-component twice in the same frame 2`] = `
 `;
 
 exports[`update a sub-component twice in the same frame, 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1874,7 +1874,7 @@ exports[`update a sub-component twice in the same frame, 2 1`] = `
 `;
 
 exports[`update a sub-component twice in the same frame, 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/error_handling.test.ts.snap b/tests/components/__snapshots__/error_handling.test.ts.snap
index bf4ce897..37efac99 100644
--- a/tests/components/__snapshots__/error_handling.test.ts.snap
+++ b/tests/components/__snapshots__/error_handling.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`basics display a nice error if a component is not a component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -12,7 +12,7 @@ exports[`basics display a nice error if a component is not a component 1`] = `
 `;
 
 exports[`basics display a nice error if it cannot find component (in dev mode) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -25,7 +25,7 @@ exports[`basics display a nice error if it cannot find component (in dev mode) 1
 `;
 
 exports[`basics display a nice error if it cannot find component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -36,7 +36,7 @@ exports[`basics display a nice error if it cannot find component 1`] = `
 `;
 
 exports[`basics no component catching error lead to full app destruction 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -50,7 +50,7 @@ exports[`basics no component catching error lead to full app destruction 1`] = `
 `;
 
 exports[`basics no component catching error lead to full app destruction 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -64,7 +64,7 @@ exports[`basics no component catching error lead to full app destruction 2`] = `
 `;
 
 exports[`basics simple catchError 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -83,7 +83,7 @@ exports[`basics simple catchError 1`] = `
 `;
 
 exports[`basics simple catchError 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -97,7 +97,7 @@ exports[`basics simple catchError 2`] = `
 `;
 
 exports[`can catch errors an error in onWillDestroy 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -113,7 +113,7 @@ exports[`can catch errors an error in onWillDestroy 1`] = `
 `;
 
 exports[`can catch errors an error in onWillDestroy 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -126,7 +126,7 @@ exports[`can catch errors an error in onWillDestroy 2`] = `
 `;
 
 exports[`can catch errors an error in onWillDestroy, variation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -142,7 +142,7 @@ exports[`can catch errors an error in onWillDestroy, variation 1`] = `
 `;
 
 exports[`can catch errors an error in onWillDestroy, variation 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -155,7 +155,7 @@ exports[`can catch errors an error in onWillDestroy, variation 2`] = `
 `;
 
 exports[`can catch errors calling a hook outside setup should crash 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -166,7 +166,7 @@ exports[`can catch errors calling a hook outside setup should crash 1`] = `
 `;
 
 exports[`can catch errors can catch an error in a component render function 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -185,7 +185,7 @@ exports[`can catch errors can catch an error in a component render function 1`]
 `;
 
 exports[`can catch errors can catch an error in a component render function 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -205,7 +205,7 @@ exports[`can catch errors can catch an error in a component render function 2`]
 `;
 
 exports[`can catch errors can catch an error in a component render function 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -219,7 +219,7 @@ exports[`can catch errors can catch an error in a component render function 3`]
 `;
 
 exports[`can catch errors can catch an error in the constructor call of a component render function 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -238,7 +238,7 @@ exports[`can catch errors can catch an error in the constructor call of a compon
 `;
 
 exports[`can catch errors can catch an error in the constructor call of a component render function 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -258,7 +258,7 @@ exports[`can catch errors can catch an error in the constructor call of a compon
 `;
 
 exports[`can catch errors can catch an error in the constructor call of a component render function 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -279,7 +279,7 @@ exports[`can catch errors can catch an error in the constructor call of a compon
 `;
 
 exports[`can catch errors can catch an error in the constructor call of a component render function 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -299,7 +299,7 @@ exports[`can catch errors can catch an error in the constructor call of a compon
 `;
 
 exports[`can catch errors can catch an error in the constructor call of a component render function 2 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -312,7 +312,7 @@ exports[`can catch errors can catch an error in the constructor call of a compon
 `;
 
 exports[`can catch errors can catch an error in the constructor call of a component render function 2 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -325,7 +325,7 @@ exports[`can catch errors can catch an error in the constructor call of a compon
 `;
 
 exports[`can catch errors can catch an error in the constructor call of a component render function 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -338,7 +338,7 @@ exports[`can catch errors can catch an error in the constructor call of a compon
 `;
 
 exports[`can catch errors can catch an error in the initial call of a component render function (parent mounted) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -357,7 +357,7 @@ exports[`can catch errors can catch an error in the initial call of a component
 `;
 
 exports[`can catch errors can catch an error in the initial call of a component render function (parent mounted) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -377,7 +377,7 @@ exports[`can catch errors can catch an error in the initial call of a component
 `;
 
 exports[`can catch errors can catch an error in the initial call of a component render function (parent mounted) 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -391,7 +391,7 @@ exports[`can catch errors can catch an error in the initial call of a component
 `;
 
 exports[`can catch errors can catch an error in the initial call of a component render function (parent updated) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -413,7 +413,7 @@ exports[`can catch errors can catch an error in the initial call of a component
 `;
 
 exports[`can catch errors can catch an error in the initial call of a component render function (parent updated) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -433,7 +433,7 @@ exports[`can catch errors can catch an error in the initial call of a component
 `;
 
 exports[`can catch errors can catch an error in the initial call of a component render function (parent updated) 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -447,7 +447,7 @@ exports[`can catch errors can catch an error in the initial call of a component
 `;
 
 exports[`can catch errors can catch an error in the mounted call (in child of child) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -458,7 +458,7 @@ exports[`can catch errors can catch an error in the mounted call (in child of ch
 `;
 
 exports[`can catch errors can catch an error in the mounted call (in child of child) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -472,7 +472,7 @@ exports[`can catch errors can catch an error in the mounted call (in child of ch
 `;
 
 exports[`can catch errors can catch an error in the mounted call (in child of child) 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -491,7 +491,7 @@ exports[`can catch errors can catch an error in the mounted call (in child of ch
 `;
 
 exports[`can catch errors can catch an error in the mounted call (in child of child) 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -504,7 +504,7 @@ exports[`can catch errors can catch an error in the mounted call (in child of ch
 `;
 
 exports[`can catch errors can catch an error in the mounted call (in root component) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -523,7 +523,7 @@ exports[`can catch errors can catch an error in the mounted call (in root compon
 `;
 
 exports[`can catch errors can catch an error in the mounted call (in root component) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -536,7 +536,7 @@ exports[`can catch errors can catch an error in the mounted call (in root compon
 `;
 
 exports[`can catch errors can catch an error in the mounted call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -555,7 +555,7 @@ exports[`can catch errors can catch an error in the mounted call 1`] = `
 `;
 
 exports[`can catch errors can catch an error in the mounted call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -575,7 +575,7 @@ exports[`can catch errors can catch an error in the mounted call 2`] = `
 `;
 
 exports[`can catch errors can catch an error in the mounted call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -588,7 +588,7 @@ exports[`can catch errors can catch an error in the mounted call 3`] = `
 `;
 
 exports[`can catch errors can catch an error in the willPatch call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -608,7 +608,7 @@ exports[`can catch errors can catch an error in the willPatch call 1`] = `
 `;
 
 exports[`can catch errors can catch an error in the willPatch call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -628,7 +628,7 @@ exports[`can catch errors can catch an error in the willPatch call 2`] = `
 `;
 
 exports[`can catch errors can catch an error in the willPatch call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -642,7 +642,7 @@ exports[`can catch errors can catch an error in the willPatch call 3`] = `
 `;
 
 exports[`can catch errors can catch an error in the willStart call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -661,7 +661,7 @@ exports[`can catch errors can catch an error in the willStart call 1`] = `
 `;
 
 exports[`can catch errors can catch an error in the willStart call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -681,7 +681,7 @@ exports[`can catch errors can catch an error in the willStart call 2`] = `
 `;
 
 exports[`can catch errors can catch an error in the willStart call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -694,7 +694,7 @@ exports[`can catch errors can catch an error in the willStart call 3`] = `
 `;
 
 exports[`can catch errors can catch an error origination from a child's willStart function 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -715,7 +715,7 @@ exports[`can catch errors can catch an error origination from a child's willStar
 `;
 
 exports[`can catch errors can catch an error origination from a child's willStart function 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -735,7 +735,7 @@ exports[`can catch errors can catch an error origination from a child's willStar
 `;
 
 exports[`can catch errors can catch an error origination from a child's willStart function 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -748,7 +748,7 @@ exports[`can catch errors can catch an error origination from a child's willStar
 `;
 
 exports[`can catch errors can catch an error origination from a child's willStart function 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -761,7 +761,7 @@ exports[`can catch errors can catch an error origination from a child's willStar
 `;
 
 exports[`can catch errors catchError in catchError 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -780,7 +780,7 @@ exports[`can catch errors catchError in catchError 1`] = `
 `;
 
 exports[`can catch errors catchError in catchError 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -794,7 +794,7 @@ exports[`can catch errors catchError in catchError 2`] = `
 `;
 
 exports[`can catch errors catchError in catchError 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -808,7 +808,7 @@ exports[`can catch errors catchError in catchError 3`] = `
 `;
 
 exports[`can catch errors catching error, rethrow, render parent  -- a main component loop implementation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, capture, markRaw, withKey } = helpers;
@@ -834,7 +834,7 @@ exports[`can catch errors catching error, rethrow, render parent  -- a main comp
 `;
 
 exports[`can catch errors catching error, rethrow, render parent  -- a main component loop implementation 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -846,7 +846,7 @@ exports[`can catch errors catching error, rethrow, render parent  -- a main comp
 `;
 
 exports[`can catch errors catching error, rethrow, render parent  -- a main component loop implementation 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -857,7 +857,7 @@ exports[`can catch errors catching error, rethrow, render parent  -- a main comp
 `;
 
 exports[`can catch errors catching error, rethrow, render parent  -- a main component loop implementation 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -870,7 +870,7 @@ exports[`can catch errors catching error, rethrow, render parent  -- a main comp
 `;
 
 exports[`can catch errors catching error, rethrow, render parent  -- a main component loop implementation 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -883,7 +883,7 @@ exports[`can catch errors catching error, rethrow, render parent  -- a main comp
 `;
 
 exports[`can catch errors catching in child makes parent render 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, capture, markRaw, withKey } = helpers;
@@ -909,7 +909,7 @@ exports[`can catch errors catching in child makes parent render 1`] = `
 `;
 
 exports[`can catch errors catching in child makes parent render 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -921,7 +921,7 @@ exports[`can catch errors catching in child makes parent render 2`] = `
 `;
 
 exports[`can catch errors catching in child makes parent render 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -934,7 +934,7 @@ exports[`can catch errors catching in child makes parent render 3`] = `
 `;
 
 exports[`can catch errors catching in child makes parent render 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -948,7 +948,7 @@ exports[`can catch errors catching in child makes parent render 4`] = `
 `;
 
 exports[`can catch errors error in mounted on a component with a sibling (properly mounted) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -968,7 +968,7 @@ exports[`can catch errors error in mounted on a component with a sibling (proper
 `;
 
 exports[`can catch errors error in mounted on a component with a sibling (properly mounted) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -979,7 +979,7 @@ exports[`can catch errors error in mounted on a component with a sibling (proper
 `;
 
 exports[`can catch errors error in mounted on a component with a sibling (properly mounted) 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -999,7 +999,7 @@ exports[`can catch errors error in mounted on a component with a sibling (proper
 `;
 
 exports[`can catch errors error in mounted on a component with a sibling (properly mounted) 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1012,7 +1012,7 @@ exports[`can catch errors error in mounted on a component with a sibling (proper
 `;
 
 exports[`can catch errors onError in class inheritance is called if rethrown 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1023,7 +1023,7 @@ exports[`can catch errors onError in class inheritance is called if rethrown 1`]
 `;
 
 exports[`can catch errors onError in class inheritance is called if rethrown 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1042,7 +1042,7 @@ exports[`can catch errors onError in class inheritance is called if rethrown 2`]
 `;
 
 exports[`can catch errors onError in class inheritance is not called if no rethrown 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1053,7 +1053,7 @@ exports[`can catch errors onError in class inheritance is not called if no rethr
 `;
 
 exports[`can catch errors onError in class inheritance is not called if no rethrown 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1072,7 +1072,7 @@ exports[`can catch errors onError in class inheritance is not called if no rethr
 `;
 
 exports[`errors and promises a rendering error in a sub component will reject the mount promise 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1086,7 +1086,7 @@ exports[`errors and promises a rendering error in a sub component will reject th
 `;
 
 exports[`errors and promises a rendering error in a sub component will reject the mount promise 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1100,7 +1100,7 @@ exports[`errors and promises a rendering error in a sub component will reject th
 `;
 
 exports[`errors and promises a rendering error will reject the mount promise 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1114,7 +1114,7 @@ exports[`errors and promises a rendering error will reject the mount promise 1`]
 `;
 
 exports[`errors and promises a rendering error will reject the render promise (with sub components) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1129,7 +1129,7 @@ exports[`errors and promises a rendering error will reject the render promise (w
 `;
 
 exports[`errors and promises a rendering error will reject the render promise (with sub components) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1142,7 +1142,7 @@ exports[`errors and promises a rendering error will reject the render promise (w
 `;
 
 exports[`errors and promises a rendering error will reject the render promise 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1159,7 +1159,7 @@ exports[`errors and promises a rendering error will reject the render promise 1`
 `;
 
 exports[`errors and promises an error in mounted call will reject the mount promise 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1172,7 +1172,7 @@ exports[`errors and promises an error in mounted call will reject the mount prom
 `;
 
 exports[`errors and promises an error in onMounted callback will have the component's setup in its stack trace 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1185,7 +1185,7 @@ exports[`errors and promises an error in onMounted callback will have the compon
 `;
 
 exports[`errors and promises an error in patched call will reject the render promise 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1199,7 +1199,7 @@ exports[`errors and promises an error in patched call will reject the render pro
 `;
 
 exports[`errors and promises an error in willPatch call will reject the render promise 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1213,7 +1213,7 @@ exports[`errors and promises an error in willPatch call will reject the render p
 `;
 
 exports[`errors and promises errors in mounted and in willUnmount 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1226,7 +1226,7 @@ exports[`errors and promises errors in mounted and in willUnmount 1`] = `
 `;
 
 exports[`errors and promises errors in onWillRender/onRender aren't wrapped more than once 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1239,7 +1239,7 @@ exports[`errors and promises errors in onWillRender/onRender aren't wrapped more
 `;
 
 exports[`errors and promises errors in rerender 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/event_handling.test.ts.snap b/tests/components/__snapshots__/event_handling.test.ts.snap
index 0cb9dc4e..583537f1 100644
--- a/tests/components/__snapshots__/event_handling.test.ts.snap
+++ b/tests/components/__snapshots__/event_handling.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`event handling Invalid handler throws an error 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -15,7 +15,7 @@ exports[`event handling Invalid handler throws an error 1`] = `
 `;
 
 exports[`event handling handler is not called if component is destroyed 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -29,7 +29,7 @@ exports[`event handling handler is not called if component is destroyed 1`] = `
 `;
 
 exports[`event handling handler receive the event as argument 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -45,7 +45,7 @@ exports[`event handling handler receive the event as argument 1`] = `
 `;
 
 exports[`event handling handler receive the event as argument 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -58,7 +58,7 @@ exports[`event handling handler receive the event as argument 2`] = `
 `;
 
 exports[`event handling input blur event is not called if component is destroyed 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -75,7 +75,7 @@ exports[`event handling input blur event is not called if component is destroyed
 `;
 
 exports[`event handling input blur event is not called if component is destroyed 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -89,7 +89,7 @@ exports[`event handling input blur event is not called if component is destroyed
 `;
 
 exports[`event handling objects from scope are properly captured by t-on 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -115,7 +115,7 @@ exports[`event handling objects from scope are properly captured by t-on 1`] = `
 `;
 
 exports[`event handling support for callable expression in event handler 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -130,7 +130,7 @@ exports[`event handling support for callable expression in event handler 1`] = `
 `;
 
 exports[`event handling t-on with handler bound to dynamic argument on a t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
diff --git a/tests/components/__snapshots__/higher_order_component.test.ts.snap b/tests/components/__snapshots__/higher_order_component.test.ts.snap
index 4724513c..864793e0 100644
--- a/tests/components/__snapshots__/higher_order_component.test.ts.snap
+++ b/tests/components/__snapshots__/higher_order_component.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`basics basic use 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -12,7 +12,7 @@ exports[`basics basic use 1`] = `
 `;
 
 exports[`basics basic use 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -26,7 +26,7 @@ exports[`basics basic use 2`] = `
 `;
 
 exports[`basics can select a sub widget  1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -44,7 +44,7 @@ exports[`basics can select a sub widget  1`] = `
 `;
 
 exports[`basics can select a sub widget  2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -57,7 +57,7 @@ exports[`basics can select a sub widget  2`] = `
 `;
 
 exports[`basics can select a sub widget  3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -70,7 +70,7 @@ exports[`basics can select a sub widget  3`] = `
 `;
 
 exports[`basics can select a sub widget, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -88,7 +88,7 @@ exports[`basics can select a sub widget, part 2 1`] = `
 `;
 
 exports[`basics can select a sub widget, part 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -101,7 +101,7 @@ exports[`basics can select a sub widget, part 2 2`] = `
 `;
 
 exports[`basics can select a sub widget, part 2 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -114,7 +114,7 @@ exports[`basics can select a sub widget, part 2 3`] = `
 `;
 
 exports[`basics sub widget is interactive 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -125,7 +125,7 @@ exports[`basics sub widget is interactive 1`] = `
 `;
 
 exports[`basics sub widget is interactive 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -140,7 +140,7 @@ exports[`basics sub widget is interactive 2`] = `
 `;
 
 exports[`basics top level sub widget with a parent 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -154,7 +154,7 @@ exports[`basics top level sub widget with a parent 1`] = `
 `;
 
 exports[`basics top level sub widget with a parent 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -165,7 +165,7 @@ exports[`basics top level sub widget with a parent 2`] = `
 `;
 
 exports[`basics top level sub widget with a parent 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/hooks.test.ts.snap b/tests/components/__snapshots__/hooks.test.ts.snap
index 2a8c4763..81a86068 100644
--- a/tests/components/__snapshots__/hooks.test.ts.snap
+++ b/tests/components/__snapshots__/hooks.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`hooks autofocus hook input in a t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -22,7 +22,7 @@ exports[`hooks autofocus hook input in a t-if 1`] = `
 `;
 
 exports[`hooks autofocus hook simple input 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -38,7 +38,7 @@ exports[`hooks autofocus hook simple input 1`] = `
 `;
 
 exports[`hooks can use onWillStart, onWillUpdateProps 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -49,7 +49,7 @@ exports[`hooks can use onWillStart, onWillUpdateProps 1`] = `
 `;
 
 exports[`hooks can use onWillStart, onWillUpdateProps 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -63,7 +63,7 @@ exports[`hooks can use onWillStart, onWillUpdateProps 2`] = `
 `;
 
 exports[`hooks can use useComponent 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -76,7 +76,7 @@ exports[`hooks can use useComponent 1`] = `
 `;
 
 exports[`hooks can use useEnv 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -90,7 +90,7 @@ exports[`hooks can use useEnv 1`] = `
 `;
 
 exports[`hooks mounted callbacks should be called in reverse order from willUnmount callbacks 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -104,7 +104,7 @@ exports[`hooks mounted callbacks should be called in reverse order from willUnmo
 `;
 
 exports[`hooks parent and child env (with useChildSubEnv then useSubEnv) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -117,7 +117,7 @@ exports[`hooks parent and child env (with useChildSubEnv then useSubEnv) 1`] = `
 `;
 
 exports[`hooks parent and child env (with useChildSubEnv then useSubEnv) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -135,7 +135,7 @@ exports[`hooks parent and child env (with useChildSubEnv then useSubEnv) 2`] = `
 `;
 
 exports[`hooks parent and child env (with useChildSubEnv) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -148,7 +148,7 @@ exports[`hooks parent and child env (with useChildSubEnv) 1`] = `
 `;
 
 exports[`hooks parent and child env (with useChildSubEnv) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -162,7 +162,7 @@ exports[`hooks parent and child env (with useChildSubEnv) 2`] = `
 `;
 
 exports[`hooks parent and child env (with useSubEnv) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -175,7 +175,7 @@ exports[`hooks parent and child env (with useSubEnv) 1`] = `
 `;
 
 exports[`hooks parent and child env (with useSubEnv) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -189,7 +189,7 @@ exports[`hooks parent and child env (with useSubEnv) 2`] = `
 `;
 
 exports[`hooks two different call to willPatch/patched should work 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -203,7 +203,7 @@ exports[`hooks two different call to willPatch/patched should work 1`] = `
 `;
 
 exports[`hooks useChildSubEnv does not pollute user env 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -217,7 +217,7 @@ exports[`hooks useChildSubEnv does not pollute user env 1`] = `
 `;
 
 exports[`hooks useChildSubEnv supports arbitrary descriptor 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -228,7 +228,7 @@ exports[`hooks useChildSubEnv supports arbitrary descriptor 1`] = `
 `;
 
 exports[`hooks useChildSubEnv supports arbitrary descriptor 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -243,7 +243,7 @@ exports[`hooks useChildSubEnv supports arbitrary descriptor 2`] = `
 `;
 
 exports[`hooks useEffect hook dependencies prevent effects from rerunning when unchanged 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -256,7 +256,7 @@ exports[`hooks useEffect hook dependencies prevent effects from rerunning when u
 `;
 
 exports[`hooks useEffect hook effect can depend on stuff in dom 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -275,7 +275,7 @@ exports[`hooks useEffect hook effect can depend on stuff in dom 1`] = `
 `;
 
 exports[`hooks useEffect hook effect runs on mount, is reapplied on patch, and is cleaned up on unmount and before reapplying 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -288,7 +288,7 @@ exports[`hooks useEffect hook effect runs on mount, is reapplied on patch, and i
 `;
 
 exports[`hooks useEffect hook effect with empty dependency list never reruns 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -302,7 +302,7 @@ exports[`hooks useEffect hook effect with empty dependency list never reruns 1`]
 `;
 
 exports[`hooks useEffect hook properly behaves when the effect function throws 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -315,7 +315,7 @@ exports[`hooks useEffect hook properly behaves when the effect function throws 1
 `;
 
 exports[`hooks useExternalListener 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -330,7 +330,7 @@ exports[`hooks useExternalListener 1`] = `
 `;
 
 exports[`hooks useExternalListener 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -344,7 +344,7 @@ exports[`hooks useExternalListener 2`] = `
 `;
 
 exports[`hooks useRef hook: basic use 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -360,7 +360,7 @@ exports[`hooks useRef hook: basic use 1`] = `
 `;
 
 exports[`hooks useSubEnv modifies user env 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -374,7 +374,7 @@ exports[`hooks useSubEnv modifies user env 1`] = `
 `;
 
 exports[`hooks useSubEnv supports arbitrary descriptor 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -385,7 +385,7 @@ exports[`hooks useSubEnv supports arbitrary descriptor 1`] = `
 `;
 
 exports[`hooks useSubEnv supports arbitrary descriptor 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/lifecycle.test.ts.snap b/tests/components/__snapshots__/lifecycle.test.ts.snap
index 19a52e7c..7f2fb870 100644
--- a/tests/components/__snapshots__/lifecycle.test.ts.snap
+++ b/tests/components/__snapshots__/lifecycle.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`lifecycle hooks basic checks for a component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -14,7 +14,7 @@ exports[`lifecycle hooks basic checks for a component 1`] = `
 `;
 
 exports[`lifecycle hooks component semantics 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -29,7 +29,7 @@ exports[`lifecycle hooks component semantics 1`] = `
 `;
 
 exports[`lifecycle hooks component semantics 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -42,7 +42,7 @@ exports[`lifecycle hooks component semantics 2`] = `
 `;
 
 exports[`lifecycle hooks component semantics 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -62,7 +62,7 @@ exports[`lifecycle hooks component semantics 3`] = `
 `;
 
 exports[`lifecycle hooks component semantics 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -75,7 +75,7 @@ exports[`lifecycle hooks component semantics 4`] = `
 `;
 
 exports[`lifecycle hooks component semantics 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -88,7 +88,7 @@ exports[`lifecycle hooks component semantics 5`] = `
 `;
 
 exports[`lifecycle hooks component semantics 6`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -101,7 +101,7 @@ exports[`lifecycle hooks component semantics 6`] = `
 `;
 
 exports[`lifecycle hooks components are unmounted and destroyed if no longer in DOM, even after updateprops 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -119,7 +119,7 @@ exports[`lifecycle hooks components are unmounted and destroyed if no longer in
 `;
 
 exports[`lifecycle hooks components are unmounted and destroyed if no longer in DOM, even after updateprops 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -133,7 +133,7 @@ exports[`lifecycle hooks components are unmounted and destroyed if no longer in
 `;
 
 exports[`lifecycle hooks components are unmounted destroyed if no longer in DOM 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -148,7 +148,7 @@ exports[`lifecycle hooks components are unmounted destroyed if no longer in DOM
 `;
 
 exports[`lifecycle hooks components are unmounted destroyed if no longer in DOM 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -161,7 +161,7 @@ exports[`lifecycle hooks components are unmounted destroyed if no longer in DOM
 `;
 
 exports[`lifecycle hooks destroy new children before being mountged 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -178,7 +178,7 @@ exports[`lifecycle hooks destroy new children before being mountged 1`] = `
 `;
 
 exports[`lifecycle hooks destroy new children before being mountged 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -189,7 +189,7 @@ exports[`lifecycle hooks destroy new children before being mountged 2`] = `
 `;
 
 exports[`lifecycle hooks hooks are called in proper order in widget creation/destruction 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -203,7 +203,7 @@ exports[`lifecycle hooks hooks are called in proper order in widget creation/des
 `;
 
 exports[`lifecycle hooks hooks are called in proper order in widget creation/destruction 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -216,7 +216,7 @@ exports[`lifecycle hooks hooks are called in proper order in widget creation/des
 `;
 
 exports[`lifecycle hooks lifecycle callbacks are bound to component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -227,7 +227,7 @@ exports[`lifecycle hooks lifecycle callbacks are bound to component 1`] = `
 `;
 
 exports[`lifecycle hooks lifecycle callbacks are bound to component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -238,7 +238,7 @@ exports[`lifecycle hooks lifecycle callbacks are bound to component 2`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -252,7 +252,7 @@ exports[`lifecycle hooks lifecycle semantics 1`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -265,7 +265,7 @@ exports[`lifecycle hooks lifecycle semantics 2`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -280,7 +280,7 @@ exports[`lifecycle hooks lifecycle semantics, part 2 1`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -291,7 +291,7 @@ exports[`lifecycle hooks lifecycle semantics, part 2 2`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 2 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -304,7 +304,7 @@ exports[`lifecycle hooks lifecycle semantics, part 2 3`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -319,7 +319,7 @@ exports[`lifecycle hooks lifecycle semantics, part 3 1`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 4 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -334,7 +334,7 @@ exports[`lifecycle hooks lifecycle semantics, part 4 1`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 4 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -345,7 +345,7 @@ exports[`lifecycle hooks lifecycle semantics, part 4 2`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 4 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -358,7 +358,7 @@ exports[`lifecycle hooks lifecycle semantics, part 4 3`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 5 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -373,7 +373,7 @@ exports[`lifecycle hooks lifecycle semantics, part 5 1`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 5 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -386,7 +386,7 @@ exports[`lifecycle hooks lifecycle semantics, part 5 2`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 6 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -397,7 +397,7 @@ exports[`lifecycle hooks lifecycle semantics, part 6 1`] = `
 `;
 
 exports[`lifecycle hooks lifecycle semantics, part 6 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -410,7 +410,7 @@ exports[`lifecycle hooks lifecycle semantics, part 6 2`] = `
 `;
 
 exports[`lifecycle hooks mounted hook is called if mounted in DOM 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -423,7 +423,7 @@ exports[`lifecycle hooks mounted hook is called if mounted in DOM 1`] = `
 `;
 
 exports[`lifecycle hooks mounted hook is called on every mount, not just the first one 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -438,7 +438,7 @@ exports[`lifecycle hooks mounted hook is called on every mount, not just the fir
 `;
 
 exports[`lifecycle hooks mounted hook is called on every mount, not just the first one 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -451,7 +451,7 @@ exports[`lifecycle hooks mounted hook is called on every mount, not just the fir
 `;
 
 exports[`lifecycle hooks mounted hook is called on subcomponents, in proper order 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -465,7 +465,7 @@ exports[`lifecycle hooks mounted hook is called on subcomponents, in proper orde
 `;
 
 exports[`lifecycle hooks mounted hook is called on subcomponents, in proper order 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -478,7 +478,7 @@ exports[`lifecycle hooks mounted hook is called on subcomponents, in proper orde
 `;
 
 exports[`lifecycle hooks mounted hook is called on subsubcomponents, in proper order 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -495,7 +495,7 @@ exports[`lifecycle hooks mounted hook is called on subsubcomponents, in proper o
 `;
 
 exports[`lifecycle hooks mounted hook is called on subsubcomponents, in proper order 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -509,7 +509,7 @@ exports[`lifecycle hooks mounted hook is called on subsubcomponents, in proper o
 `;
 
 exports[`lifecycle hooks mounted hook is called on subsubcomponents, in proper order 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -522,7 +522,7 @@ exports[`lifecycle hooks mounted hook is called on subsubcomponents, in proper o
 `;
 
 exports[`lifecycle hooks onWillRender 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -533,7 +533,7 @@ exports[`lifecycle hooks onWillRender 1`] = `
 `;
 
 exports[`lifecycle hooks onWillRender 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -548,7 +548,7 @@ exports[`lifecycle hooks onWillRender 2`] = `
 `;
 
 exports[`lifecycle hooks patched hook is called after updateProps 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -562,7 +562,7 @@ exports[`lifecycle hooks patched hook is called after updateProps 1`] = `
 `;
 
 exports[`lifecycle hooks patched hook is called after updateProps 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -575,7 +575,7 @@ exports[`lifecycle hooks patched hook is called after updateProps 2`] = `
 `;
 
 exports[`lifecycle hooks patched hook is called after updating State 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -589,7 +589,7 @@ exports[`lifecycle hooks patched hook is called after updating State 1`] = `
 `;
 
 exports[`lifecycle hooks render in mounted 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -603,7 +603,7 @@ exports[`lifecycle hooks render in mounted 1`] = `
 `;
 
 exports[`lifecycle hooks render in patched 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -617,7 +617,7 @@ exports[`lifecycle hooks render in patched 1`] = `
 `;
 
 exports[`lifecycle hooks render in willPatch 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -631,7 +631,7 @@ exports[`lifecycle hooks render in willPatch 1`] = `
 `;
 
 exports[`lifecycle hooks sub widget (inside sub node): hooks are correctly called 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -646,7 +646,7 @@ exports[`lifecycle hooks sub widget (inside sub node): hooks are correctly calle
 `;
 
 exports[`lifecycle hooks sub widget (inside sub node): hooks are correctly called 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -659,7 +659,7 @@ exports[`lifecycle hooks sub widget (inside sub node): hooks are correctly calle
 `;
 
 exports[`lifecycle hooks timeout in onWillStart emits a warning 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -672,7 +672,7 @@ exports[`lifecycle hooks timeout in onWillStart emits a warning 1`] = `
 `;
 
 exports[`lifecycle hooks timeout in onWillUpdateProps emits a warning 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -685,7 +685,7 @@ exports[`lifecycle hooks timeout in onWillUpdateProps emits a warning 1`] = `
 `;
 
 exports[`lifecycle hooks timeout in onWillUpdateProps emits a warning 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -696,7 +696,7 @@ exports[`lifecycle hooks timeout in onWillUpdateProps emits a warning 2`] = `
 `;
 
 exports[`lifecycle hooks willPatch, patched hook are called on subsubcomponents, in proper order 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -710,7 +710,7 @@ exports[`lifecycle hooks willPatch, patched hook are called on subsubcomponents,
 `;
 
 exports[`lifecycle hooks willPatch, patched hook are called on subsubcomponents, in proper order 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -724,7 +724,7 @@ exports[`lifecycle hooks willPatch, patched hook are called on subsubcomponents,
 `;
 
 exports[`lifecycle hooks willPatch, patched hook are called on subsubcomponents, in proper order 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -738,7 +738,7 @@ exports[`lifecycle hooks willPatch, patched hook are called on subsubcomponents,
 `;
 
 exports[`lifecycle hooks willStart hook is called on sub component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -749,7 +749,7 @@ exports[`lifecycle hooks willStart hook is called on sub component 1`] = `
 `;
 
 exports[`lifecycle hooks willStart hook is called on sub component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -762,7 +762,7 @@ exports[`lifecycle hooks willStart hook is called on sub component 2`] = `
 `;
 
 exports[`lifecycle hooks willStart is called 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -775,7 +775,7 @@ exports[`lifecycle hooks willStart is called 1`] = `
 `;
 
 exports[`lifecycle hooks willStart is called with component as this 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -788,7 +788,7 @@ exports[`lifecycle hooks willStart is called with component as this 1`] = `
 `;
 
 exports[`lifecycle hooks willStart, mounted on subwidget rendered after main is mounted in some other position 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -808,7 +808,7 @@ exports[`lifecycle hooks willStart, mounted on subwidget rendered after main is
 `;
 
 exports[`lifecycle hooks willStart, mounted on subwidget rendered after main is mounted in some other position 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -821,7 +821,7 @@ exports[`lifecycle hooks willStart, mounted on subwidget rendered after main is
 `;
 
 exports[`lifecycle hooks willUpdateProps hook is called 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -832,7 +832,7 @@ exports[`lifecycle hooks willUpdateProps hook is called 1`] = `
 `;
 
 exports[`lifecycle hooks willUpdateProps hook is called 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/props.test.ts.snap b/tests/components/__snapshots__/props.test.ts.snap
index 75b6c87f..f49c4214 100644
--- a/tests/components/__snapshots__/props.test.ts.snap
+++ b/tests/components/__snapshots__/props.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`basics accept ES6-like syntax for props (with getters) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -15,7 +15,7 @@ exports[`basics accept ES6-like syntax for props (with getters) 1`] = `
 `;
 
 exports[`basics accept ES6-like syntax for props (with getters) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -29,7 +29,7 @@ exports[`basics accept ES6-like syntax for props (with getters) 2`] = `
 `;
 
 exports[`basics arrow functions as prop correctly capture their scope 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -50,7 +50,7 @@ exports[`basics arrow functions as prop correctly capture their scope 1`] = `
 `;
 
 exports[`basics arrow functions as prop correctly capture their scope 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -64,7 +64,7 @@ exports[`basics arrow functions as prop correctly capture their scope 2`] = `
 `;
 
 exports[`basics explicit object prop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -78,7 +78,7 @@ exports[`basics explicit object prop 1`] = `
 `;
 
 exports[`basics explicit object prop 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -92,7 +92,7 @@ exports[`basics explicit object prop 2`] = `
 `;
 
 exports[`basics prop names can contain - 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -103,7 +103,7 @@ exports[`basics prop names can contain - 1`] = `
 `;
 
 exports[`basics prop names can contain - 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -117,7 +117,7 @@ exports[`basics prop names can contain - 2`] = `
 `;
 
 exports[`basics support prop names that aren't valid bare object property names 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -128,7 +128,7 @@ exports[`basics support prop names that aren't valid bare object property names
 `;
 
 exports[`basics support prop names that aren't valid bare object property names 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -142,7 +142,7 @@ exports[`basics support prop names that aren't valid bare object property names
 `;
 
 exports[`basics t-set with a body expression can be passed in props, and then t-out 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue } = helpers;
@@ -165,7 +165,7 @@ exports[`basics t-set with a body expression can be passed in props, and then t-
 `;
 
 exports[`basics t-set with a body expression can be passed in props, and then t-out 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { safeOutput } = helpers;
@@ -181,7 +181,7 @@ exports[`basics t-set with a body expression can be passed in props, and then t-
 `;
 
 exports[`basics t-set with a body expression can be used as textual prop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -199,7 +199,7 @@ exports[`basics t-set with a body expression can be used as textual prop 1`] = `
 `;
 
 exports[`basics t-set with a body expression can be used as textual prop 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -213,7 +213,7 @@ exports[`basics t-set with a body expression can be used as textual prop 2`] = `
 `;
 
 exports[`basics t-set works  1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -231,7 +231,7 @@ exports[`basics t-set works  1`] = `
 `;
 
 exports[`basics t-set works  2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -245,7 +245,7 @@ exports[`basics t-set works  2`] = `
 `;
 
 exports[`basics template string in prop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -256,7 +256,7 @@ exports[`basics template string in prop 1`] = `
 `;
 
 exports[`basics template string in prop 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -267,7 +267,7 @@ exports[`basics template string in prop 2`] = `
 `;
 
 exports[`bound functions is referentially equal after update 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { bind } = helpers;
@@ -279,7 +279,7 @@ exports[`bound functions is referentially equal after update 1`] = `
 `;
 
 exports[`bound functions is referentially equal after update 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -290,7 +290,7 @@ exports[`bound functions is referentially equal after update 2`] = `
 `;
 
 exports[`can bind function prop with bind suffix 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { bind } = helpers;
@@ -302,7 +302,7 @@ exports[`can bind function prop with bind suffix 1`] = `
 `;
 
 exports[`can bind function prop with bind suffix 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/props_validation.test.ts.snap b/tests/components/__snapshots__/props_validation.test.ts.snap
index 976ae949..f2075064 100644
--- a/tests/components/__snapshots__/props_validation.test.ts.snap
+++ b/tests/components/__snapshots__/props_validation.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`default props a default prop cannot be defined on a mandatory prop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -14,7 +14,7 @@ exports[`default props a default prop cannot be defined on a mandatory prop 1`]
 `;
 
 exports[`default props can set default boolean values 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -30,7 +30,7 @@ exports[`default props can set default boolean values 1`] = `
 `;
 
 exports[`default props can set default boolean values 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -50,7 +50,7 @@ exports[`default props can set default boolean values 2`] = `
 `;
 
 exports[`default props can set default values 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -66,7 +66,7 @@ exports[`default props can set default values 1`] = `
 `;
 
 exports[`default props can set default values 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -80,7 +80,7 @@ exports[`default props can set default values 2`] = `
 `;
 
 exports[`default props default values are also set whenever component is updated 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -96,7 +96,7 @@ exports[`default props default values are also set whenever component is updated
 `;
 
 exports[`default props default values are also set whenever component is updated 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -110,7 +110,7 @@ exports[`default props default values are also set whenever component is updated
 `;
 
 exports[`props validation can specify that additional props are allowed (array) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -123,7 +123,7 @@ exports[`props validation can specify that additional props are allowed (array)
 `;
 
 exports[`props validation can specify that additional props are allowed (array) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -136,7 +136,7 @@ exports[`props validation can specify that additional props are allowed (array)
 `;
 
 exports[`props validation can specify that additional props are allowed (object) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -149,7 +149,7 @@ exports[`props validation can specify that additional props are allowed (object)
 `;
 
 exports[`props validation can specify that additional props are allowed (object) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -162,7 +162,7 @@ exports[`props validation can specify that additional props are allowed (object)
 `;
 
 exports[`props validation can validate a prop with multiple types 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -178,7 +178,7 @@ exports[`props validation can validate a prop with multiple types 1`] = `
 `;
 
 exports[`props validation can validate a prop with multiple types 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -191,7 +191,7 @@ exports[`props validation can validate a prop with multiple types 2`] = `
 `;
 
 exports[`props validation can validate a prop with multiple types 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -207,7 +207,7 @@ exports[`props validation can validate a prop with multiple types 3`] = `
 `;
 
 exports[`props validation can validate a prop with multiple types 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -220,7 +220,7 @@ exports[`props validation can validate a prop with multiple types 4`] = `
 `;
 
 exports[`props validation can validate a prop with multiple types 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -236,7 +236,7 @@ exports[`props validation can validate a prop with multiple types 5`] = `
 `;
 
 exports[`props validation can validate an array with given primitive type 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -252,7 +252,7 @@ exports[`props validation can validate an array with given primitive type 1`] =
 `;
 
 exports[`props validation can validate an array with given primitive type 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -265,7 +265,7 @@ exports[`props validation can validate an array with given primitive type 2`] =
 `;
 
 exports[`props validation can validate an array with given primitive type 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -281,7 +281,7 @@ exports[`props validation can validate an array with given primitive type 3`] =
 `;
 
 exports[`props validation can validate an array with given primitive type 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -294,7 +294,7 @@ exports[`props validation can validate an array with given primitive type 4`] =
 `;
 
 exports[`props validation can validate an array with given primitive type 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -310,7 +310,7 @@ exports[`props validation can validate an array with given primitive type 5`] =
 `;
 
 exports[`props validation can validate an array with given primitive type 6`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -326,7 +326,7 @@ exports[`props validation can validate an array with given primitive type 6`] =
 `;
 
 exports[`props validation can validate an array with multiple sub element types 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -342,7 +342,7 @@ exports[`props validation can validate an array with multiple sub element types
 `;
 
 exports[`props validation can validate an array with multiple sub element types 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -355,7 +355,7 @@ exports[`props validation can validate an array with multiple sub element types
 `;
 
 exports[`props validation can validate an array with multiple sub element types 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -371,7 +371,7 @@ exports[`props validation can validate an array with multiple sub element types
 `;
 
 exports[`props validation can validate an array with multiple sub element types 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -384,7 +384,7 @@ exports[`props validation can validate an array with multiple sub element types
 `;
 
 exports[`props validation can validate an array with multiple sub element types 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -400,7 +400,7 @@ exports[`props validation can validate an array with multiple sub element types
 `;
 
 exports[`props validation can validate an array with multiple sub element types 6`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -413,7 +413,7 @@ exports[`props validation can validate an array with multiple sub element types
 `;
 
 exports[`props validation can validate an array with multiple sub element types 7`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -429,7 +429,7 @@ exports[`props validation can validate an array with multiple sub element types
 `;
 
 exports[`props validation can validate an object with simple shape 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -445,7 +445,7 @@ exports[`props validation can validate an object with simple shape 1`] = `
 `;
 
 exports[`props validation can validate an object with simple shape 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -458,7 +458,7 @@ exports[`props validation can validate an object with simple shape 2`] = `
 `;
 
 exports[`props validation can validate an object with simple shape 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -474,7 +474,7 @@ exports[`props validation can validate an object with simple shape 3`] = `
 `;
 
 exports[`props validation can validate an object with simple shape 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -490,7 +490,7 @@ exports[`props validation can validate an object with simple shape 4`] = `
 `;
 
 exports[`props validation can validate an object with simple shape 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -506,7 +506,7 @@ exports[`props validation can validate an object with simple shape 5`] = `
 `;
 
 exports[`props validation can validate an optional props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -522,7 +522,7 @@ exports[`props validation can validate an optional props 1`] = `
 `;
 
 exports[`props validation can validate an optional props 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -535,7 +535,7 @@ exports[`props validation can validate an optional props 2`] = `
 `;
 
 exports[`props validation can validate an optional props 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -551,7 +551,7 @@ exports[`props validation can validate an optional props 3`] = `
 `;
 
 exports[`props validation can validate an optional props 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -564,7 +564,7 @@ exports[`props validation can validate an optional props 4`] = `
 `;
 
 exports[`props validation can validate an optional props 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -580,7 +580,7 @@ exports[`props validation can validate an optional props 5`] = `
 `;
 
 exports[`props validation can validate recursively complicated prop def 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -596,7 +596,7 @@ exports[`props validation can validate recursively complicated prop def 1`] = `
 `;
 
 exports[`props validation can validate recursively complicated prop def 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -609,7 +609,7 @@ exports[`props validation can validate recursively complicated prop def 2`] = `
 `;
 
 exports[`props validation can validate recursively complicated prop def 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -625,7 +625,7 @@ exports[`props validation can validate recursively complicated prop def 3`] = `
 `;
 
 exports[`props validation can validate recursively complicated prop def 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -638,7 +638,7 @@ exports[`props validation can validate recursively complicated prop def 4`] = `
 `;
 
 exports[`props validation can validate recursively complicated prop def 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -654,7 +654,7 @@ exports[`props validation can validate recursively complicated prop def 5`] = `
 `;
 
 exports[`props validation default values are applied before validating props at update 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -670,7 +670,7 @@ exports[`props validation default values are applied before validating props at
 `;
 
 exports[`props validation default values are applied before validating props at update 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -684,7 +684,7 @@ exports[`props validation default values are applied before validating props at
 `;
 
 exports[`props validation missing required boolean prop causes an error 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -700,7 +700,7 @@ exports[`props validation missing required boolean prop causes an error 1`] = `
 `;
 
 exports[`props validation mix of optional and mandatory 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -716,7 +716,7 @@ exports[`props validation mix of optional and mandatory 1`] = `
 `;
 
 exports[`props validation props are validated in dev mode (code snapshot) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -732,7 +732,7 @@ exports[`props validation props are validated in dev mode (code snapshot) 1`] =
 `;
 
 exports[`props validation props are validated in dev mode (code snapshot) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -746,7 +746,7 @@ exports[`props validation props are validated in dev mode (code snapshot) 2`] =
 `;
 
 exports[`props validation props are validated whenever component is updated 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -762,7 +762,7 @@ exports[`props validation props are validated whenever component is updated 1`]
 `;
 
 exports[`props validation props are validated whenever component is updated 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -776,7 +776,7 @@ exports[`props validation props are validated whenever component is updated 2`]
 `;
 
 exports[`props validation props: list of strings 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -792,7 +792,7 @@ exports[`props validation props: list of strings 1`] = `
 `;
 
 exports[`props validation validate simple types 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -808,7 +808,7 @@ exports[`props validation validate simple types 1`] = `
 `;
 
 exports[`props validation validate simple types 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -824,7 +824,7 @@ exports[`props validation validate simple types 2`] = `
 `;
 
 exports[`props validation validate simple types 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -837,7 +837,7 @@ exports[`props validation validate simple types 3`] = `
 `;
 
 exports[`props validation validate simple types 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -853,7 +853,7 @@ exports[`props validation validate simple types 4`] = `
 `;
 
 exports[`props validation validate simple types 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -869,7 +869,7 @@ exports[`props validation validate simple types 5`] = `
 `;
 
 exports[`props validation validate simple types 6`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -885,7 +885,7 @@ exports[`props validation validate simple types 6`] = `
 `;
 
 exports[`props validation validate simple types 7`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -898,7 +898,7 @@ exports[`props validation validate simple types 7`] = `
 `;
 
 exports[`props validation validate simple types 8`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -914,7 +914,7 @@ exports[`props validation validate simple types 8`] = `
 `;
 
 exports[`props validation validate simple types 9`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -930,7 +930,7 @@ exports[`props validation validate simple types 9`] = `
 `;
 
 exports[`props validation validate simple types 10`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -946,7 +946,7 @@ exports[`props validation validate simple types 10`] = `
 `;
 
 exports[`props validation validate simple types 11`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -959,7 +959,7 @@ exports[`props validation validate simple types 11`] = `
 `;
 
 exports[`props validation validate simple types 12`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -975,7 +975,7 @@ exports[`props validation validate simple types 12`] = `
 `;
 
 exports[`props validation validate simple types 13`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -991,7 +991,7 @@ exports[`props validation validate simple types 13`] = `
 `;
 
 exports[`props validation validate simple types 14`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1007,7 +1007,7 @@ exports[`props validation validate simple types 14`] = `
 `;
 
 exports[`props validation validate simple types 15`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1020,7 +1020,7 @@ exports[`props validation validate simple types 15`] = `
 `;
 
 exports[`props validation validate simple types 16`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1036,7 +1036,7 @@ exports[`props validation validate simple types 16`] = `
 `;
 
 exports[`props validation validate simple types 17`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1052,7 +1052,7 @@ exports[`props validation validate simple types 17`] = `
 `;
 
 exports[`props validation validate simple types 18`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1068,7 +1068,7 @@ exports[`props validation validate simple types 18`] = `
 `;
 
 exports[`props validation validate simple types 19`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1081,7 +1081,7 @@ exports[`props validation validate simple types 19`] = `
 `;
 
 exports[`props validation validate simple types 20`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1097,7 +1097,7 @@ exports[`props validation validate simple types 20`] = `
 `;
 
 exports[`props validation validate simple types 21`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1113,7 +1113,7 @@ exports[`props validation validate simple types 21`] = `
 `;
 
 exports[`props validation validate simple types 22`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1129,7 +1129,7 @@ exports[`props validation validate simple types 22`] = `
 `;
 
 exports[`props validation validate simple types 23`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1142,7 +1142,7 @@ exports[`props validation validate simple types 23`] = `
 `;
 
 exports[`props validation validate simple types 24`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1158,7 +1158,7 @@ exports[`props validation validate simple types 24`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1174,7 +1174,7 @@ exports[`props validation validate simple types, alternate form 1`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1190,7 +1190,7 @@ exports[`props validation validate simple types, alternate form 2`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1203,7 +1203,7 @@ exports[`props validation validate simple types, alternate form 3`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1219,7 +1219,7 @@ exports[`props validation validate simple types, alternate form 4`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1235,7 +1235,7 @@ exports[`props validation validate simple types, alternate form 5`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 6`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1251,7 +1251,7 @@ exports[`props validation validate simple types, alternate form 6`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 7`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1264,7 +1264,7 @@ exports[`props validation validate simple types, alternate form 7`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 8`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1280,7 +1280,7 @@ exports[`props validation validate simple types, alternate form 8`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 9`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1296,7 +1296,7 @@ exports[`props validation validate simple types, alternate form 9`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 10`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1312,7 +1312,7 @@ exports[`props validation validate simple types, alternate form 10`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 11`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1325,7 +1325,7 @@ exports[`props validation validate simple types, alternate form 11`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 12`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1341,7 +1341,7 @@ exports[`props validation validate simple types, alternate form 12`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 13`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1357,7 +1357,7 @@ exports[`props validation validate simple types, alternate form 13`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 14`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1373,7 +1373,7 @@ exports[`props validation validate simple types, alternate form 14`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 15`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1386,7 +1386,7 @@ exports[`props validation validate simple types, alternate form 15`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 16`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1402,7 +1402,7 @@ exports[`props validation validate simple types, alternate form 16`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 17`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1418,7 +1418,7 @@ exports[`props validation validate simple types, alternate form 17`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 18`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1434,7 +1434,7 @@ exports[`props validation validate simple types, alternate form 18`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 19`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1447,7 +1447,7 @@ exports[`props validation validate simple types, alternate form 19`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 20`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1463,7 +1463,7 @@ exports[`props validation validate simple types, alternate form 20`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 21`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1479,7 +1479,7 @@ exports[`props validation validate simple types, alternate form 21`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 22`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1495,7 +1495,7 @@ exports[`props validation validate simple types, alternate form 22`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 23`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1508,7 +1508,7 @@ exports[`props validation validate simple types, alternate form 23`] = `
 `;
 
 exports[`props validation validate simple types, alternate form 24`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1524,7 +1524,7 @@ exports[`props validation validate simple types, alternate form 24`] = `
 `;
 
 exports[`props validation validation is only done in dev mode 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1540,7 +1540,7 @@ exports[`props validation validation is only done in dev mode 1`] = `
 `;
 
 exports[`props validation validation is only done in dev mode 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1554,7 +1554,7 @@ exports[`props validation validation is only done in dev mode 2`] = `
 `;
 
 exports[`props validation validation is only done in dev mode 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/reactivity.test.ts.snap b/tests/components/__snapshots__/reactivity.test.ts.snap
index 8eacf43c..c60380e9 100644
--- a/tests/components/__snapshots__/reactivity.test.ts.snap
+++ b/tests/components/__snapshots__/reactivity.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`reactivity in lifecycle Child component doesn't render when state they depend on changes but their parent is about to unmount them 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -16,7 +16,7 @@ exports[`reactivity in lifecycle Child component doesn't render when state they
 `;
 
 exports[`reactivity in lifecycle Child component doesn't render when state they depend on changes but their parent is about to unmount them 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -27,7 +27,7 @@ exports[`reactivity in lifecycle Child component doesn't render when state they
 `;
 
 exports[`reactivity in lifecycle Component is automatically subscribed to reactive object received as prop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -38,7 +38,7 @@ exports[`reactivity in lifecycle Component is automatically subscribed to reacti
 `;
 
 exports[`reactivity in lifecycle Component is automatically subscribed to reactive object received as prop 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -51,7 +51,7 @@ exports[`reactivity in lifecycle Component is automatically subscribed to reacti
 `;
 
 exports[`reactivity in lifecycle can use a state hook 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -65,7 +65,7 @@ exports[`reactivity in lifecycle can use a state hook 1`] = `
 `;
 
 exports[`reactivity in lifecycle can use a state hook 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -79,7 +79,7 @@ exports[`reactivity in lifecycle can use a state hook 2 1`] = `
 `;
 
 exports[`reactivity in lifecycle can use a state hook on Map 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -93,7 +93,7 @@ exports[`reactivity in lifecycle can use a state hook on Map 1`] = `
 `;
 
 exports[`reactivity in lifecycle change state while mounting component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -107,7 +107,7 @@ exports[`reactivity in lifecycle change state while mounting component 1`] = `
 `;
 
 exports[`reactivity in lifecycle state changes in willUnmount do not trigger rerender 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -124,7 +124,7 @@ exports[`reactivity in lifecycle state changes in willUnmount do not trigger rer
 `;
 
 exports[`reactivity in lifecycle state changes in willUnmount do not trigger rerender 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/refs.test.ts.snap b/tests/components/__snapshots__/refs.test.ts.snap
index 2f55ab9c..b458061d 100644
--- a/tests/components/__snapshots__/refs.test.ts.snap
+++ b/tests/components/__snapshots__/refs.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`refs basic use 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -16,7 +16,7 @@ exports[`refs basic use 1`] = `
 `;
 
 exports[`refs can use 2 refs with same name in a t-if/t-else situation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { multiRefSetter } = helpers;
@@ -39,7 +39,7 @@ exports[`refs can use 2 refs with same name in a t-if/t-else situation 1`] = `
 `;
 
 exports[`refs refs and recursive templates 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -59,7 +59,7 @@ exports[`refs refs and recursive templates 1`] = `
 `;
 
 exports[`refs refs are properly bound in slots 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -84,7 +84,7 @@ exports[`refs refs are properly bound in slots 1`] = `
 `;
 
 exports[`refs refs are properly bound in slots 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -99,7 +99,7 @@ exports[`refs refs are properly bound in slots 2`] = `
 `;
 
 exports[`refs throws if there are 2 same refs at the same time 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { multiRefSetter } = helpers;
diff --git a/tests/components/__snapshots__/rendering.test.ts.snap b/tests/components/__snapshots__/rendering.test.ts.snap
index 8f44f53e..8cd9a8b0 100644
--- a/tests/components/__snapshots__/rendering.test.ts.snap
+++ b/tests/components/__snapshots__/rendering.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`force render in case of existing render 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -12,7 +12,7 @@ exports[`force render in case of existing render 1`] = `
 `;
 
 exports[`force render in case of existing render 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -25,7 +25,7 @@ exports[`force render in case of existing render 2`] = `
 `;
 
 exports[`force render in case of existing render 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -36,7 +36,7 @@ exports[`force render in case of existing render 3`] = `
 `;
 
 exports[`rendering semantics can force a render to update sub tree 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -49,7 +49,7 @@ exports[`rendering semantics can force a render to update sub tree 1`] = `
 `;
 
 exports[`rendering semantics can force a render to update sub tree 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -60,7 +60,7 @@ exports[`rendering semantics can force a render to update sub tree 2`] = `
 `;
 
 exports[`rendering semantics can render a parent without rendering child 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -73,7 +73,7 @@ exports[`rendering semantics can render a parent without rendering child 1`] = `
 `;
 
 exports[`rendering semantics can render a parent without rendering child 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -84,7 +84,7 @@ exports[`rendering semantics can render a parent without rendering child 2`] = `
 `;
 
 exports[`rendering semantics props are reactive (nested prop) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -95,7 +95,7 @@ exports[`rendering semantics props are reactive (nested prop) 1`] = `
 `;
 
 exports[`rendering semantics props are reactive (nested prop) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -106,7 +106,7 @@ exports[`rendering semantics props are reactive (nested prop) 2`] = `
 `;
 
 exports[`rendering semantics props are reactive 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -117,7 +117,7 @@ exports[`rendering semantics props are reactive 1`] = `
 `;
 
 exports[`rendering semantics props are reactive 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -128,7 +128,7 @@ exports[`rendering semantics props are reactive 2`] = `
 `;
 
 exports[`rendering semantics render need a boolean = true to be 'deep' 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -141,7 +141,7 @@ exports[`rendering semantics render need a boolean = true to be 'deep' 1`] = `
 `;
 
 exports[`rendering semantics render need a boolean = true to be 'deep' 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -152,7 +152,7 @@ exports[`rendering semantics render need a boolean = true to be 'deep' 2`] = `
 `;
 
 exports[`rendering semantics render with deep=true followed by render with deep=false work as expected 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -166,7 +166,7 @@ exports[`rendering semantics render with deep=true followed by render with deep=
 `;
 
 exports[`rendering semantics render with deep=true followed by render with deep=false work as expected 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -179,7 +179,7 @@ exports[`rendering semantics render with deep=true followed by render with deep=
 `;
 
 exports[`rendering semantics rendering is atomic (for one subtree) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -192,7 +192,7 @@ exports[`rendering semantics rendering is atomic (for one subtree) 1`] = `
 `;
 
 exports[`rendering semantics rendering is atomic (for one subtree) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -203,7 +203,7 @@ exports[`rendering semantics rendering is atomic (for one subtree) 2`] = `
 `;
 
 exports[`rendering semantics rendering is atomic (for one subtree) 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -214,7 +214,7 @@ exports[`rendering semantics rendering is atomic (for one subtree) 3`] = `
 `;
 
 exports[`rendering semantics works as expected for dynamic number of props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -225,7 +225,7 @@ exports[`rendering semantics works as expected for dynamic number of props 1`] =
 `;
 
 exports[`rendering semantics works as expected for dynamic number of props 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/slots.test.ts.snap b/tests/components/__snapshots__/slots.test.ts.snap
index d00d8521..7cac48a8 100644
--- a/tests/components/__snapshots__/slots.test.ts.snap
+++ b/tests/components/__snapshots__/slots.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`slots can define a default content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -15,7 +15,7 @@ exports[`slots can define a default content 1`] = `
 `;
 
 exports[`slots can define a default content 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -34,7 +34,7 @@ exports[`slots can define a default content 2`] = `
 `;
 
 exports[`slots can define and call slots 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -60,7 +60,7 @@ exports[`slots can define and call slots 1`] = `
 `;
 
 exports[`slots can define and call slots 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -76,7 +76,7 @@ exports[`slots can define and call slots 2`] = `
 `;
 
 exports[`slots can define and call slots with bound params 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, bind, markRaw } = helpers;
@@ -93,7 +93,7 @@ exports[`slots can define and call slots with bound params 1`] = `
 `;
 
 exports[`slots can define and call slots with bound params 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -107,7 +107,7 @@ exports[`slots can define and call slots with bound params 2`] = `
 `;
 
 exports[`slots can define and call slots with params 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -133,7 +133,7 @@ exports[`slots can define and call slots with params 1`] = `
 `;
 
 exports[`slots can define and call slots with params 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -151,7 +151,7 @@ exports[`slots can define and call slots with params 2`] = `
 `;
 
 exports[`slots can render node with t-ref and Component in same slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -173,7 +173,7 @@ exports[`slots can render node with t-ref and Component in same slot 1`] = `
 `;
 
 exports[`slots can render node with t-ref and Component in same slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -185,7 +185,7 @@ exports[`slots can render node with t-ref and Component in same slot 2`] = `
 `;
 
 exports[`slots can render only empty slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -197,7 +197,7 @@ exports[`slots can render only empty slot 1`] = `
 `;
 
 exports[`slots can use component in default-content of t-slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -208,7 +208,7 @@ exports[`slots can use component in default-content of t-slot 1`] = `
 `;
 
 exports[`slots can use component in default-content of t-slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -224,7 +224,7 @@ exports[`slots can use component in default-content of t-slot 2`] = `
 `;
 
 exports[`slots can use component in default-content of t-slot 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -235,7 +235,7 @@ exports[`slots can use component in default-content of t-slot 3`] = `
 `;
 
 exports[`slots can use t-call in default-content of t-slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -246,11 +246,11 @@ exports[`slots can use t-call in default-content of t-slot 1`] = `
 `;
 
 exports[`slots can use t-call in default-content of t-slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { callSlot, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  let { callSlot } = helpers;
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   function defaultContent1(ctx, node, key = \\"\\") {
     return callTemplate_1.call(this, ctx, node, key + \`__1\`);
@@ -263,7 +263,7 @@ exports[`slots can use t-call in default-content of t-slot 2`] = `
 `;
 
 exports[`slots can use t-call in default-content of t-slot 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -274,7 +274,7 @@ exports[`slots can use t-call in default-content of t-slot 3`] = `
 `;
 
 exports[`slots content is the default slot (variation) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -292,7 +292,7 @@ exports[`slots content is the default slot (variation) 1`] = `
 `;
 
 exports[`slots content is the default slot (variation) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -304,7 +304,7 @@ exports[`slots content is the default slot (variation) 2`] = `
 `;
 
 exports[`slots content is the default slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -324,7 +324,7 @@ exports[`slots content is the default slot 1`] = `
 `;
 
 exports[`slots content is the default slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -339,7 +339,7 @@ exports[`slots content is the default slot 2`] = `
 `;
 
 exports[`slots default content is not rendered if named slot is provided 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -359,7 +359,7 @@ exports[`slots default content is not rendered if named slot is provided 1`] = `
 `;
 
 exports[`slots default content is not rendered if named slot is provided 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -378,7 +378,7 @@ exports[`slots default content is not rendered if named slot is provided 2`] = `
 `;
 
 exports[`slots default content is not rendered if slot is provided 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -397,7 +397,7 @@ exports[`slots default content is not rendered if slot is provided 1`] = `
 `;
 
 exports[`slots default content is not rendered if slot is provided 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -416,7 +416,7 @@ exports[`slots default content is not rendered if slot is provided 2`] = `
 `;
 
 exports[`slots default slot next to named slot, with default content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -436,7 +436,7 @@ exports[`slots default slot next to named slot, with default content 1`] = `
 `;
 
 exports[`slots default slot next to named slot, with default content 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -460,7 +460,7 @@ exports[`slots default slot next to named slot, with default content 2`] = `
 `;
 
 exports[`slots default slot with params with - in it 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -476,7 +476,7 @@ exports[`slots default slot with params with - in it 1`] = `
 `;
 
 exports[`slots default slot with params with - in it 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -488,7 +488,7 @@ exports[`slots default slot with params with - in it 2`] = `
 `;
 
 exports[`slots default slot with slot scope: shorthand syntax 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -510,7 +510,7 @@ exports[`slots default slot with slot scope: shorthand syntax 1`] = `
 `;
 
 exports[`slots default slot with slot scope: shorthand syntax 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -525,7 +525,7 @@ exports[`slots default slot with slot scope: shorthand syntax 2`] = `
 `;
 
 exports[`slots default slot work with text nodes (variation) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -541,7 +541,7 @@ exports[`slots default slot work with text nodes (variation) 1`] = `
 `;
 
 exports[`slots default slot work with text nodes (variation) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -553,7 +553,7 @@ exports[`slots default slot work with text nodes (variation) 2`] = `
 `;
 
 exports[`slots default slot work with text nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -572,7 +572,7 @@ exports[`slots default slot work with text nodes 1`] = `
 `;
 
 exports[`slots default slot work with text nodes 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -587,7 +587,7 @@ exports[`slots default slot work with text nodes 2`] = `
 `;
 
 exports[`slots dynamic t-slot call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -616,7 +616,7 @@ exports[`slots dynamic t-slot call 1`] = `
 `;
 
 exports[`slots dynamic t-slot call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -633,7 +633,7 @@ exports[`slots dynamic t-slot call 2`] = `
 `;
 
 exports[`slots dynamic t-slot call with default 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -662,7 +662,7 @@ exports[`slots dynamic t-slot call with default 1`] = `
 `;
 
 exports[`slots dynamic t-slot call with default 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -682,7 +682,7 @@ exports[`slots dynamic t-slot call with default 2`] = `
 `;
 
 exports[`slots fun: two calls to the same slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -698,7 +698,7 @@ exports[`slots fun: two calls to the same slot 1`] = `
 `;
 
 exports[`slots fun: two calls to the same slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -712,7 +712,7 @@ exports[`slots fun: two calls to the same slot 2`] = `
 `;
 
 exports[`slots missing slots are ignored 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -726,7 +726,7 @@ exports[`slots missing slots are ignored 1`] = `
 `;
 
 exports[`slots missing slots are ignored 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -742,7 +742,7 @@ exports[`slots missing slots are ignored 2`] = `
 `;
 
 exports[`slots mix of slots, t-call, t-call with body, and giving own props child 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -753,7 +753,7 @@ exports[`slots mix of slots, t-call, t-call with body, and giving own props chil
 `;
 
 exports[`slots mix of slots, t-call, t-call with body, and giving own props child 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -769,11 +769,11 @@ exports[`slots mix of slots, t-call, t-call with body, and giving own props chil
 `;
 
 exports[`slots mix of slots, t-call, t-call with body, and giving own props child 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { capture, getTemplate, markRaw } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__1002\`);
+  let { capture, markRaw } = helpers;
+  const callTemplate_1 = app.getTemplate(\`__template__1002\`);
   
   function slot1(ctx, node, key = \\"\\") {
     const b2 = text(\`[A]\`);
@@ -789,11 +789,11 @@ exports[`slots mix of slots, t-call, t-call with body, and giving own props chil
 `;
 
 exports[`slots mix of slots, t-call, t-call with body, and giving own props child 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__1001\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`__template__1001\`);
   
   return function template(ctx, node, key = \\"\\") {
     ctx = Object.create(ctx);
@@ -810,7 +810,7 @@ exports[`slots mix of slots, t-call, t-call with body, and giving own props chil
 `;
 
 exports[`slots mix of slots, t-call, t-call with body, and giving own props child 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -824,7 +824,7 @@ exports[`slots mix of slots, t-call, t-call with body, and giving own props chil
 `;
 
 exports[`slots mix of slots, t-call, t-call with body, and giving own props child 6`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -837,7 +837,7 @@ exports[`slots mix of slots, t-call, t-call with body, and giving own props chil
 `;
 
 exports[`slots mix of slots, t-call, t-call with body, and giving own props child 7`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -851,7 +851,7 @@ exports[`slots mix of slots, t-call, t-call with body, and giving own props chil
 `;
 
 exports[`slots multiple roots are allowed in a default slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -874,7 +874,7 @@ exports[`slots multiple roots are allowed in a default slot 1`] = `
 `;
 
 exports[`slots multiple roots are allowed in a default slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -889,7 +889,7 @@ exports[`slots multiple roots are allowed in a default slot 2`] = `
 `;
 
 exports[`slots multiple roots are allowed in a named slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -913,7 +913,7 @@ exports[`slots multiple roots are allowed in a named slot 1`] = `
 `;
 
 exports[`slots multiple roots are allowed in a named slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -928,7 +928,7 @@ exports[`slots multiple roots are allowed in a named slot 2`] = `
 `;
 
 exports[`slots multiple slots containing components 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -949,7 +949,7 @@ exports[`slots multiple slots containing components 1`] = `
 `;
 
 exports[`slots multiple slots containing components 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -965,7 +965,7 @@ exports[`slots multiple slots containing components 2`] = `
 `;
 
 exports[`slots multiple slots containing components 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -979,7 +979,7 @@ exports[`slots multiple slots containing components 3`] = `
 `;
 
 exports[`slots named slot inside slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -1012,7 +1012,7 @@ exports[`slots named slot inside slot 1`] = `
 `;
 
 exports[`slots named slot inside slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1028,7 +1028,7 @@ exports[`slots named slot inside slot 2`] = `
 `;
 
 exports[`slots named slot inside slot, part 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -1061,7 +1061,7 @@ exports[`slots named slot inside slot, part 3 1`] = `
 `;
 
 exports[`slots named slot inside slot, part 3 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1077,7 +1077,7 @@ exports[`slots named slot inside slot, part 3 2`] = `
 `;
 
 exports[`slots named slots can define a default content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1091,7 +1091,7 @@ exports[`slots named slots can define a default content 1`] = `
 `;
 
 exports[`slots named slots can define a default content 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1110,7 +1110,7 @@ exports[`slots named slots can define a default content 2`] = `
 `;
 
 exports[`slots named slots inside slot, again 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -1143,7 +1143,7 @@ exports[`slots named slots inside slot, again 1`] = `
 `;
 
 exports[`slots named slots inside slot, again 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1168,7 +1168,7 @@ exports[`slots named slots inside slot, again 2`] = `
 `;
 
 exports[`slots nested slots in same template 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1191,7 +1191,7 @@ exports[`slots nested slots in same template 1`] = `
 `;
 
 exports[`slots nested slots in same template 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1206,7 +1206,7 @@ exports[`slots nested slots in same template 2`] = `
 `;
 
 exports[`slots nested slots in same template 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1221,7 +1221,7 @@ exports[`slots nested slots in same template 3`] = `
 `;
 
 exports[`slots nested slots in same template 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1234,7 +1234,7 @@ exports[`slots nested slots in same template 4`] = `
 `;
 
 exports[`slots nested slots: evaluation context and parented relationship 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1250,7 +1250,7 @@ exports[`slots nested slots: evaluation context and parented relationship 1`] =
 `;
 
 exports[`slots nested slots: evaluation context and parented relationship 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot, markRaw } = helpers;
@@ -1266,7 +1266,7 @@ exports[`slots nested slots: evaluation context and parented relationship 2`] =
 `;
 
 exports[`slots nested slots: evaluation context and parented relationship 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1281,7 +1281,7 @@ exports[`slots nested slots: evaluation context and parented relationship 3`] =
 `;
 
 exports[`slots nested slots: evaluation context and parented relationship 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1295,7 +1295,7 @@ exports[`slots nested slots: evaluation context and parented relationship 4`] =
 `;
 
 exports[`slots no named slot content => just no children 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1306,7 +1306,7 @@ exports[`slots no named slot content => just no children 1`] = `
 `;
 
 exports[`slots no named slot content => just no children 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1321,7 +1321,7 @@ exports[`slots no named slot content => just no children 2`] = `
 `;
 
 exports[`slots simple default slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1337,7 +1337,7 @@ exports[`slots simple default slot 1`] = `
 `;
 
 exports[`slots simple default slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1352,7 +1352,7 @@ exports[`slots simple default slot 2`] = `
 `;
 
 exports[`slots simple default slot with params 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1374,7 +1374,7 @@ exports[`slots simple default slot with params 1`] = `
 `;
 
 exports[`slots simple default slot with params 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1389,7 +1389,7 @@ exports[`slots simple default slot with params 2`] = `
 `;
 
 exports[`slots simple default slot with params and bound function 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1405,7 +1405,7 @@ exports[`slots simple default slot with params and bound function 1`] = `
 `;
 
 exports[`slots simple default slot with params and bound function 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot, bind } = helpers;
@@ -1417,7 +1417,7 @@ exports[`slots simple default slot with params and bound function 2`] = `
 `;
 
 exports[`slots simple default slot, variation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1433,7 +1433,7 @@ exports[`slots simple default slot, variation 1`] = `
 `;
 
 exports[`slots simple default slot, variation 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1445,7 +1445,7 @@ exports[`slots simple default slot, variation 2`] = `
 `;
 
 exports[`slots simple dynamic slot with slot scope 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -1468,7 +1468,7 @@ exports[`slots simple dynamic slot with slot scope 1`] = `
 `;
 
 exports[`slots simple dynamic slot with slot scope 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1484,7 +1484,7 @@ exports[`slots simple dynamic slot with slot scope 2`] = `
 `;
 
 exports[`slots simple named and empty slot -- 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -1497,7 +1497,7 @@ exports[`slots simple named and empty slot -- 2 1`] = `
 `;
 
 exports[`slots simple named and empty slot -- 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1516,7 +1516,7 @@ exports[`slots simple named and empty slot -- 2 2`] = `
 `;
 
 exports[`slots simple named and empty slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -1533,7 +1533,7 @@ exports[`slots simple named and empty slot 1`] = `
 `;
 
 exports[`slots simple named and empty slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1549,7 +1549,7 @@ exports[`slots simple named and empty slot 2`] = `
 `;
 
 exports[`slots simple slot with slot scope 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -1572,7 +1572,7 @@ exports[`slots simple slot with slot scope 1`] = `
 `;
 
 exports[`slots simple slot with slot scope 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1587,11 +1587,11 @@ exports[`slots simple slot with slot scope 2`] = `
 `;
 
 exports[`slots slot and (inline) t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { capture, getTemplate, markRaw } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  let { capture, markRaw } = helpers;
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -1608,7 +1608,7 @@ exports[`slots slot and (inline) t-call 1`] = `
 `;
 
 exports[`slots slot and (inline) t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1621,7 +1621,7 @@ exports[`slots slot and (inline) t-call 2`] = `
 `;
 
 exports[`slots slot and (inline) t-call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1636,11 +1636,11 @@ exports[`slots slot and (inline) t-call 3`] = `
 `;
 
 exports[`slots slot and t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { capture, getTemplate, markRaw } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  let { capture, markRaw } = helpers;
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -1657,7 +1657,7 @@ exports[`slots slot and t-call 1`] = `
 `;
 
 exports[`slots slot and t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1670,7 +1670,7 @@ exports[`slots slot and t-call 2`] = `
 `;
 
 exports[`slots slot and t-call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1685,7 +1685,7 @@ exports[`slots slot and t-call 3`] = `
 `;
 
 exports[`slots slot and t-esc 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1704,7 +1704,7 @@ exports[`slots slot and t-esc 1`] = `
 `;
 
 exports[`slots slot and t-esc 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1719,7 +1719,7 @@ exports[`slots slot and t-esc 2`] = `
 `;
 
 exports[`slots slot are properly rendered if inner props are changed 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1740,7 +1740,7 @@ exports[`slots slot are properly rendered if inner props are changed 1`] = `
 `;
 
 exports[`slots slot are properly rendered if inner props are changed 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1755,7 +1755,7 @@ exports[`slots slot are properly rendered if inner props are changed 2`] = `
 `;
 
 exports[`slots slot are properly rendered if inner props are changed 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1769,7 +1769,7 @@ exports[`slots slot are properly rendered if inner props are changed 3`] = `
 `;
 
 exports[`slots slot content has different key from other content -- dynamic slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1785,7 +1785,7 @@ exports[`slots slot content has different key from other content -- dynamic slot
 `;
 
 exports[`slots slot content has different key from other content -- dynamic slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1800,7 +1800,7 @@ exports[`slots slot content has different key from other content -- dynamic slot
 `;
 
 exports[`slots slot content has different key from other content -- dynamic slot 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1814,7 +1814,7 @@ exports[`slots slot content has different key from other content -- dynamic slot
 `;
 
 exports[`slots slot content has different key from other content -- static slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1830,7 +1830,7 @@ exports[`slots slot content has different key from other content -- static slot
 `;
 
 exports[`slots slot content has different key from other content -- static slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1844,7 +1844,7 @@ exports[`slots slot content has different key from other content -- static slot
 `;
 
 exports[`slots slot content has different key from other content -- static slot 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1858,7 +1858,7 @@ exports[`slots slot content has different key from other content -- static slot
 `;
 
 exports[`slots slot content is bound to caller (variation) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, isBoundary, withDefault, setContextValue, markRaw } = helpers;
@@ -1881,7 +1881,7 @@ exports[`slots slot content is bound to caller (variation) 1`] = `
 `;
 
 exports[`slots slot content is bound to caller (variation) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1896,7 +1896,7 @@ exports[`slots slot content is bound to caller (variation) 2`] = `
 `;
 
 exports[`slots slot content is bound to caller 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1915,7 +1915,7 @@ exports[`slots slot content is bound to caller 1`] = `
 `;
 
 exports[`slots slot content is bound to caller 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1930,7 +1930,7 @@ exports[`slots slot content is bound to caller 2`] = `
 `;
 
 exports[`slots slot preserves properly parented relationship 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -1949,7 +1949,7 @@ exports[`slots slot preserves properly parented relationship 1`] = `
 `;
 
 exports[`slots slot preserves properly parented relationship 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -1961,7 +1961,7 @@ exports[`slots slot preserves properly parented relationship 2`] = `
 `;
 
 exports[`slots slot preserves properly parented relationship 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -1972,11 +1972,11 @@ exports[`slots slot preserves properly parented relationship 3`] = `
 `;
 
 exports[`slots slot preserves properly parented relationship, even through t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { capture, getTemplate, markRaw } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
+  let { capture, markRaw } = helpers;
+  const callTemplate_1 = app.getTemplate(\`sub\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -1993,7 +1993,7 @@ exports[`slots slot preserves properly parented relationship, even through t-cal
 `;
 
 exports[`slots slot preserves properly parented relationship, even through t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -2004,7 +2004,7 @@ exports[`slots slot preserves properly parented relationship, even through t-cal
 `;
 
 exports[`slots slot preserves properly parented relationship, even through t-call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2016,7 +2016,7 @@ exports[`slots slot preserves properly parented relationship, even through t-cal
 `;
 
 exports[`slots slot preserves properly parented relationship, even through t-call 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -2027,7 +2027,7 @@ exports[`slots slot preserves properly parented relationship, even through t-cal
 `;
 
 exports[`slots slots and wrapper components 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -2043,7 +2043,7 @@ exports[`slots slots and wrapper components 1`] = `
 `;
 
 exports[`slots slots and wrapper components 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2058,7 +2058,7 @@ exports[`slots slots and wrapper components 2`] = `
 `;
 
 exports[`slots slots are properly bound to correct component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -2069,7 +2069,7 @@ exports[`slots slots are properly bound to correct component 1`] = `
 `;
 
 exports[`slots slots are properly bound to correct component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot, isBoundary, withDefault, setContextValue } = helpers;
@@ -2092,7 +2092,7 @@ exports[`slots slots are properly bound to correct component 2`] = `
 `;
 
 exports[`slots slots are rendered with proper context 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -2115,7 +2115,7 @@ exports[`slots slots are rendered with proper context 1`] = `
 `;
 
 exports[`slots slots are rendered with proper context 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2130,7 +2130,7 @@ exports[`slots slots are rendered with proper context 2`] = `
 `;
 
 exports[`slots slots are rendered with proper context, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, capture, markRaw, withKey } = helpers;
@@ -2161,7 +2161,7 @@ exports[`slots slots are rendered with proper context, part 2 1`] = `
 `;
 
 exports[`slots slots are rendered with proper context, part 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2177,7 +2177,7 @@ exports[`slots slots are rendered with proper context, part 2 2`] = `
 `;
 
 exports[`slots slots are rendered with proper context, part 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, isBoundary, withDefault, setContextValue, capture, markRaw, withKey } = helpers;
@@ -2209,7 +2209,7 @@ exports[`slots slots are rendered with proper context, part 3 1`] = `
 `;
 
 exports[`slots slots are rendered with proper context, part 3 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2225,7 +2225,7 @@ exports[`slots slots are rendered with proper context, part 3 2`] = `
 `;
 
 exports[`slots slots are rendered with proper context, part 4 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, capture, markRaw } = helpers;
@@ -2248,7 +2248,7 @@ exports[`slots slots are rendered with proper context, part 4 1`] = `
 `;
 
 exports[`slots slots are rendered with proper context, part 4 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2264,7 +2264,7 @@ exports[`slots slots are rendered with proper context, part 4 2`] = `
 `;
 
 exports[`slots slots in slots, with vars 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, capture, markRaw } = helpers;
@@ -2289,7 +2289,7 @@ exports[`slots slots in slots, with vars 1`] = `
 `;
 
 exports[`slots slots in slots, with vars 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot, markRaw } = helpers;
@@ -2308,7 +2308,7 @@ exports[`slots slots in slots, with vars 2`] = `
 `;
 
 exports[`slots slots in slots, with vars 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2323,7 +2323,7 @@ exports[`slots slots in slots, with vars 3`] = `
 `;
 
 exports[`slots slots in t-foreach and re-rendering 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, capture, markRaw, withKey } = helpers;
@@ -2351,7 +2351,7 @@ exports[`slots slots in t-foreach and re-rendering 1`] = `
 `;
 
 exports[`slots slots in t-foreach and re-rendering 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2367,7 +2367,7 @@ exports[`slots slots in t-foreach and re-rendering 2`] = `
 `;
 
 exports[`slots slots in t-foreach in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, capture, markRaw, withKey } = helpers;
@@ -2410,7 +2410,7 @@ exports[`slots slots in t-foreach in t-foreach 1`] = `
 `;
 
 exports[`slots slots in t-foreach in t-foreach 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2425,7 +2425,7 @@ exports[`slots slots in t-foreach in t-foreach 2`] = `
 `;
 
 exports[`slots slots in t-foreach with t-set and re-rendering 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, isBoundary, withDefault, setContextValue, capture, markRaw, withKey } = helpers;
@@ -2456,7 +2456,7 @@ exports[`slots slots in t-foreach with t-set and re-rendering 1`] = `
 `;
 
 exports[`slots slots in t-foreach with t-set and re-rendering 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2472,7 +2472,7 @@ exports[`slots slots in t-foreach with t-set and re-rendering 2`] = `
 `;
 
 exports[`slots t-debug on a t-set-slot (defining a slot) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, markRaw } = helpers;
@@ -2493,7 +2493,7 @@ exports[`slots t-debug on a t-set-slot (defining a slot) 1`] = `
 `;
 
 exports[`slots t-debug on a t-set-slot (defining a slot) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2508,7 +2508,7 @@ exports[`slots t-debug on a t-set-slot (defining a slot) 2`] = `
 `;
 
 exports[`slots t-set t-value in a slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, isBoundary, withDefault, setContextValue, markRaw } = helpers;
@@ -2531,7 +2531,7 @@ exports[`slots t-set t-value in a slot 1`] = `
 `;
 
 exports[`slots t-set t-value in a slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2546,11 +2546,11 @@ exports[`slots t-set t-value in a slot 2`] = `
 `;
 
 exports[`slots t-slot in recursive templates 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { capture, prepareList, isBoundary, withDefault, setContextValue, getTemplate, withKey, markRaw } = helpers;
-  const callTemplate_1 = getTemplate(\`_test_recursive_template\`);
+  let { capture, prepareList, isBoundary, withDefault, setContextValue, withKey, markRaw } = helpers;
+  const callTemplate_1 = app.getTemplate(\`_test_recursive_template\`);
   
   function slot1(ctx, node, key = \\"\\") {
     ctx = Object.create(ctx);
@@ -2591,7 +2591,7 @@ exports[`slots t-slot in recursive templates 1`] = `
 `;
 
 exports[`slots t-slot in recursive templates 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2606,7 +2606,7 @@ exports[`slots t-slot in recursive templates 2`] = `
 `;
 
 exports[`slots t-slot nested within another slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -2625,7 +2625,7 @@ exports[`slots t-slot nested within another slot 1`] = `
 `;
 
 exports[`slots t-slot nested within another slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot, markRaw } = helpers;
@@ -2648,7 +2648,7 @@ exports[`slots t-slot nested within another slot 2`] = `
 `;
 
 exports[`slots t-slot nested within another slot 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2663,7 +2663,7 @@ exports[`slots t-slot nested within another slot 3`] = `
 `;
 
 exports[`slots t-slot nested within another slot 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2678,7 +2678,7 @@ exports[`slots t-slot nested within another slot 4`] = `
 `;
 
 exports[`slots t-slot nested within another slot 5`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -2691,7 +2691,7 @@ exports[`slots t-slot nested within another slot 5`] = `
 `;
 
 exports[`slots t-slot scope context 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -2709,7 +2709,7 @@ exports[`slots t-slot scope context 1`] = `
 `;
 
 exports[`slots t-slot scope context 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot, markRaw } = helpers;
@@ -2729,7 +2729,7 @@ exports[`slots t-slot scope context 2`] = `
 `;
 
 exports[`slots t-slot scope context 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2741,10 +2741,11 @@ exports[`slots t-slot scope context 3`] = `
 `;
 
 exports[`slots t-slot within dynamic t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { capture, call, markRaw } = helpers;
+  let { capture, markRaw } = helpers;
+  const call = app.callTemplate.bind(app);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -2762,7 +2763,7 @@ exports[`slots t-slot within dynamic t-call 1`] = `
 `;
 
 exports[`slots t-slot within dynamic t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2777,7 +2778,7 @@ exports[`slots t-slot within dynamic t-call 2`] = `
 `;
 
 exports[`slots t-slot within dynamic t-call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -2791,7 +2792,7 @@ exports[`slots t-slot within dynamic t-call 3`] = `
 `;
 
 exports[`slots t-slot within dynamic t-call 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -2804,7 +2805,7 @@ exports[`slots t-slot within dynamic t-call 4`] = `
 `;
 
 exports[`slots template can just return a slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -2823,7 +2824,7 @@ exports[`slots template can just return a slot 1`] = `
 `;
 
 exports[`slots template can just return a slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -2835,7 +2836,7 @@ exports[`slots template can just return a slot 2`] = `
 `;
 
 exports[`slots template can just return a slot 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/style_class.test.ts.snap b/tests/components/__snapshots__/style_class.test.ts.snap
index 9ec8c482..cf3b1253 100644
--- a/tests/components/__snapshots__/style_class.test.ts.snap
+++ b/tests/components/__snapshots__/style_class.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`style and class handling can set class on multi root component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -12,7 +12,7 @@ exports[`style and class handling can set class on multi root component 1`] = `
 `;
 
 exports[`style and class handling can set class on multi root component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -29,7 +29,7 @@ exports[`style and class handling can set class on multi root component 2`] = `
 `;
 
 exports[`style and class handling can set class on sub component, as prop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -40,7 +40,7 @@ exports[`style and class handling can set class on sub component, as prop 1`] =
 `;
 
 exports[`style and class handling can set class on sub component, as prop 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -54,7 +54,7 @@ exports[`style and class handling can set class on sub component, as prop 2`] =
 `;
 
 exports[`style and class handling can set class on sub sub component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -65,7 +65,7 @@ exports[`style and class handling can set class on sub sub component 1`] = `
 `;
 
 exports[`style and class handling can set class on sub sub component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -76,7 +76,7 @@ exports[`style and class handling can set class on sub sub component 2`] = `
 `;
 
 exports[`style and class handling can set class on sub sub component 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -90,7 +90,7 @@ exports[`style and class handling can set class on sub sub component 3`] = `
 `;
 
 exports[`style and class handling can set more than one class on sub component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -101,7 +101,7 @@ exports[`style and class handling can set more than one class on sub component 1
 `;
 
 exports[`style and class handling can set more than one class on sub component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -115,7 +115,7 @@ exports[`style and class handling can set more than one class on sub component 2
 `;
 
 exports[`style and class handling can set style and class inside component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -128,7 +128,7 @@ exports[`style and class handling can set style and class inside component 1`] =
 `;
 
 exports[`style and class handling class on components do not interfere with user defined classes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -142,7 +142,7 @@ exports[`style and class handling class on components do not interfere with user
 `;
 
 exports[`style and class handling class on sub component, which is switched to another 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -153,7 +153,7 @@ exports[`style and class handling class on sub component, which is switched to a
 `;
 
 exports[`style and class handling class on sub component, which is switched to another 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -170,7 +170,7 @@ exports[`style and class handling class on sub component, which is switched to a
 `;
 
 exports[`style and class handling class on sub component, which is switched to another 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -184,7 +184,7 @@ exports[`style and class handling class on sub component, which is switched to a
 `;
 
 exports[`style and class handling class on sub component, which is switched to another 4`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -198,7 +198,7 @@ exports[`style and class handling class on sub component, which is switched to a
 `;
 
 exports[`style and class handling class with extra whitespaces (variation) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -212,7 +212,7 @@ exports[`style and class handling class with extra whitespaces (variation) 1`] =
 `;
 
 exports[`style and class handling class with extra whitespaces (variation) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -226,7 +226,7 @@ exports[`style and class handling class with extra whitespaces (variation) 2`] =
 `;
 
 exports[`style and class handling class with extra whitespaces 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -237,7 +237,7 @@ exports[`style and class handling class with extra whitespaces 1`] = `
 `;
 
 exports[`style and class handling class with extra whitespaces 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -251,7 +251,7 @@ exports[`style and class handling class with extra whitespaces 2`] = `
 `;
 
 exports[`style and class handling component class and parent class combine together 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -262,7 +262,7 @@ exports[`style and class handling component class and parent class combine toget
 `;
 
 exports[`style and class handling component class and parent class combine together 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -303,7 +303,7 @@ exports[`style and class handling dynamic t-att-style is properly added and upda
 `;
 
 exports[`style and class handling empty class attribute is not added on widget root el 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -317,7 +317,7 @@ exports[`style and class handling empty class attribute is not added on widget r
 `;
 
 exports[`style and class handling empty class attribute is not added on widget root el 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -331,7 +331,7 @@ exports[`style and class handling empty class attribute is not added on widget r
 `;
 
 exports[`style and class handling error in subcomponent with class 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -342,7 +342,7 @@ exports[`style and class handling error in subcomponent with class 1`] = `
 `;
 
 exports[`style and class handling error in subcomponent with class 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -357,7 +357,7 @@ exports[`style and class handling error in subcomponent with class 2`] = `
 `;
 
 exports[`style and class handling no class is set is child ignores it 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -368,7 +368,7 @@ exports[`style and class handling no class is set is child ignores it 1`] = `
 `;
 
 exports[`style and class handling no class is set is child ignores it 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -381,7 +381,7 @@ exports[`style and class handling no class is set is child ignores it 2`] = `
 `;
 
 exports[`style and class handling no class is set is parent does not give it as prop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -392,7 +392,7 @@ exports[`style and class handling no class is set is parent does not give it as
 `;
 
 exports[`style and class handling no class is set is parent does not give it as prop 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -406,7 +406,7 @@ exports[`style and class handling no class is set is parent does not give it as
 `;
 
 exports[`style and class handling style is properly added on widget root el 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -417,7 +417,7 @@ exports[`style and class handling style is properly added on widget root el 1`]
 `;
 
 exports[`style and class handling style is properly added on widget root el 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -431,7 +431,7 @@ exports[`style and class handling style is properly added on widget root el 2`]
 `;
 
 exports[`style and class handling t-att-class is properly added/removed on widget root el (v2) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -445,7 +445,7 @@ exports[`style and class handling t-att-class is properly added/removed on widge
 `;
 
 exports[`style and class handling t-att-class is properly added/removed on widget root el (v2) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -459,7 +459,7 @@ exports[`style and class handling t-att-class is properly added/removed on widge
 `;
 
 exports[`style and class handling t-att-class is properly added/removed on widget root el (v3) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -470,7 +470,7 @@ exports[`style and class handling t-att-class is properly added/removed on widge
 `;
 
 exports[`style and class handling t-att-class is properly added/removed on widget root el (v3) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/t_call.test.ts.snap b/tests/components/__snapshots__/t_call.test.ts.snap
index 9d94e182..01202479 100644
--- a/tests/components/__snapshots__/t_call.test.ts.snap
+++ b/tests/components/__snapshots__/t_call.test.ts.snap
@@ -1,10 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-call dynamic t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, zero, call } = helpers;
+  let { isBoundary, zero } = helpers;
+  const call = app.callTemplate.bind(app);
   
   return function template(ctx, node, key = \\"\\") {
     ctx = Object.create(ctx);
@@ -18,7 +19,7 @@ exports[`t-call dynamic t-call 1`] = `
 `;
 
 exports[`t-call dynamic t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -31,7 +32,7 @@ exports[`t-call dynamic t-call 2`] = `
 `;
 
 exports[`t-call dynamic t-call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -42,10 +43,10 @@ exports[`t-call dynamic t-call 3`] = `
 `;
 
 exports[`t-call dynamic t-call: key is propagated 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { call } = helpers;
+  const call = app.callTemplate.bind(app);
   
   return function template(ctx, node, key = \\"\\") {
     const b2 = component(\`Child\`, {}, key + \`__1\`, node, ctx);
@@ -57,7 +58,7 @@ exports[`t-call dynamic t-call: key is propagated 1`] = `
 `;
 
 exports[`t-call dynamic t-call: key is propagated 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -71,7 +72,7 @@ exports[`t-call dynamic t-call: key is propagated 2`] = `
 `;
 
 exports[`t-call dynamic t-call: key is propagated 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -82,10 +83,10 @@ exports[`t-call dynamic t-call: key is propagated 3`] = `
 `;
 
 exports[`t-call handlers are properly bound through a dynamic t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { call } = helpers;
+  const call = app.callTemplate.bind(app);
   
   let block1 = createBlock(\`<div><block-child-0/><block-text-0/></div>\`);
   
@@ -99,7 +100,7 @@ exports[`t-call handlers are properly bound through a dynamic t-call 1`] = `
 `;
 
 exports[`t-call handlers are properly bound through a dynamic t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -113,11 +114,10 @@ exports[`t-call handlers are properly bound through a dynamic t-call 2`] = `
 `;
 
 exports[`t-call handlers are properly bound through a t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   let block1 = createBlock(\`<div><block-child-0/><block-text-0/></div>\`);
   
@@ -130,7 +130,7 @@ exports[`t-call handlers are properly bound through a t-call 1`] = `
 `;
 
 exports[`t-call handlers are properly bound through a t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -144,11 +144,10 @@ exports[`t-call handlers are properly bound through a t-call 2`] = `
 `;
 
 exports[`t-call handlers with arguments are properly bound through a t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -160,7 +159,7 @@ exports[`t-call handlers with arguments are properly bound through a t-call 1`]
 `;
 
 exports[`t-call handlers with arguments are properly bound through a t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -175,11 +174,10 @@ exports[`t-call handlers with arguments are properly bound through a t-call 2`]
 `;
 
 exports[`t-call parent is set within t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -191,7 +189,7 @@ exports[`t-call parent is set within t-call 1`] = `
 `;
 
 exports[`t-call parent is set within t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -202,7 +200,7 @@ exports[`t-call parent is set within t-call 2`] = `
 `;
 
 exports[`t-call parent is set within t-call 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -215,11 +213,10 @@ exports[`t-call parent is set within t-call 3`] = `
 `;
 
 exports[`t-call parent is set within t-call with no parentNode 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   return function template(ctx, node, key = \\"\\") {
     return callTemplate_1.call(this, ctx, node, key + \`__1\`);
@@ -228,7 +225,7 @@ exports[`t-call parent is set within t-call with no parentNode 1`] = `
 `;
 
 exports[`t-call parent is set within t-call with no parentNode 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -239,7 +236,7 @@ exports[`t-call parent is set within t-call with no parentNode 2`] = `
 `;
 
 exports[`t-call parent is set within t-call with no parentNode 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -252,11 +249,11 @@ exports[`t-call parent is set within t-call with no parentNode 3`] = `
 `;
 
 exports[`t-call recursive t-call binding this -- static t-call 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`recursive\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`recursive\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -273,11 +270,11 @@ exports[`t-call recursive t-call binding this -- static t-call 1`] = `
 `;
 
 exports[`t-call recursive t-call binding this -- static t-call 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`recursive\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`recursive\`);
   
   let block3 = createBlock(\`<div block-handler-0=\\"click.stop\\"><block-text-1/></div>\`);
   
@@ -302,12 +299,11 @@ exports[`t-call recursive t-call binding this -- static t-call 2`] = `
 `;
 
 exports[`t-call sub components in two t-calls 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`sub\`);
-  const callTemplate_2 = getTemplate(\`sub\`);
+  const callTemplate_1 = app.getTemplate(\`sub\`);
+  const callTemplate_2 = app.getTemplate(\`sub\`);
   
   let block3 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -325,7 +321,7 @@ exports[`t-call sub components in two t-calls 1`] = `
 `;
 
 exports[`t-call sub components in two t-calls 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -336,7 +332,7 @@ exports[`t-call sub components in two t-calls 2`] = `
 `;
 
 exports[`t-call sub components in two t-calls 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -350,11 +346,11 @@ exports[`t-call sub components in two t-calls 3`] = `
 `;
 
 exports[`t-call t-call in t-foreach and children component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, getTemplate, withKey } = helpers;
-  const callTemplate_1 = getTemplate(\`__template__999\`);
+  let { prepareList, withKey } = helpers;
+  const callTemplate_1 = app.getTemplate(\`__template__999\`);
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -377,7 +373,7 @@ exports[`t-call t-call in t-foreach and children component 1`] = `
 `;
 
 exports[`t-call t-call in t-foreach and children component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -388,7 +384,7 @@ exports[`t-call t-call in t-foreach and children component 2`] = `
 `;
 
 exports[`t-call t-call in t-foreach and children component 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/t_call_block.test.ts.snap b/tests/components/__snapshots__/t_call_block.test.ts.snap
index 827d52d6..04076b24 100644
--- a/tests/components/__snapshots__/t_call_block.test.ts.snap
+++ b/tests/components/__snapshots__/t_call_block.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-call-block simple t-call-block with static text 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/t_component.test.ts.snap b/tests/components/__snapshots__/t_component.test.ts.snap
index 790c3d03..f9710a2e 100644
--- a/tests/components/__snapshots__/t_component.test.ts.snap
+++ b/tests/components/__snapshots__/t_component.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-component can switch between dynamic components without the need for a t-key 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -16,7 +16,7 @@ exports[`t-component can switch between dynamic components without the need for
 `;
 
 exports[`t-component can switch between dynamic components without the need for a t-key 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -29,7 +29,7 @@ exports[`t-component can switch between dynamic components without the need for
 `;
 
 exports[`t-component can switch between dynamic components without the need for a t-key 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -42,7 +42,7 @@ exports[`t-component can switch between dynamic components without the need for
 `;
 
 exports[`t-component can use dynamic components (the class) if given (with different root tagname) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -55,7 +55,7 @@ exports[`t-component can use dynamic components (the class) if given (with diffe
 `;
 
 exports[`t-component can use dynamic components (the class) if given (with different root tagname) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -68,7 +68,7 @@ exports[`t-component can use dynamic components (the class) if given (with diffe
 `;
 
 exports[`t-component can use dynamic components (the class) if given (with different root tagname) 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -81,7 +81,7 @@ exports[`t-component can use dynamic components (the class) if given (with diffe
 `;
 
 exports[`t-component can use dynamic components (the class) if given 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -94,7 +94,7 @@ exports[`t-component can use dynamic components (the class) if given 1`] = `
 `;
 
 exports[`t-component can use dynamic components (the class) if given 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -107,7 +107,7 @@ exports[`t-component can use dynamic components (the class) if given 2`] = `
 `;
 
 exports[`t-component can use dynamic components (the class) if given 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -120,7 +120,7 @@ exports[`t-component can use dynamic components (the class) if given 3`] = `
 `;
 
 exports[`t-component modifying a sub widget 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -135,7 +135,7 @@ exports[`t-component modifying a sub widget 1`] = `
 `;
 
 exports[`t-component modifying a sub widget 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -151,7 +151,7 @@ exports[`t-component modifying a sub widget 2`] = `
 `;
 
 exports[`t-component switching dynamic component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -163,7 +163,7 @@ exports[`t-component switching dynamic component 1`] = `
 `;
 
 exports[`t-component switching dynamic component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -176,7 +176,7 @@ exports[`t-component switching dynamic component 2`] = `
 `;
 
 exports[`t-component switching dynamic component 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -187,7 +187,7 @@ exports[`t-component switching dynamic component 3`] = `
 `;
 
 exports[`t-component t-component works in simple case 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -199,7 +199,7 @@ exports[`t-component t-component works in simple case 1`] = `
 `;
 
 exports[`t-component t-component works in simple case 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/t_foreach.test.ts.snap b/tests/components/__snapshots__/t_foreach.test.ts.snap
index 77a7d152..a1d847ab 100644
--- a/tests/components/__snapshots__/t_foreach.test.ts.snap
+++ b/tests/components/__snapshots__/t_foreach.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`list of components components in a node in a t-foreach  1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -25,7 +25,7 @@ exports[`list of components components in a node in a t-foreach  1`] = `
 `;
 
 exports[`list of components components in a node in a t-foreach  2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -39,7 +39,7 @@ exports[`list of components components in a node in a t-foreach  2`] = `
 `;
 
 exports[`list of components crash on duplicate key in dev mode 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -63,7 +63,7 @@ exports[`list of components crash on duplicate key in dev mode 1`] = `
 `;
 
 exports[`list of components crash on duplicate key in dev mode 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -74,7 +74,7 @@ exports[`list of components crash on duplicate key in dev mode 2`] = `
 `;
 
 exports[`list of components list of sub components inside other nodes 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -98,7 +98,7 @@ exports[`list of components list of sub components inside other nodes 1`] = `
 `;
 
 exports[`list of components list of sub components inside other nodes 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -111,7 +111,7 @@ exports[`list of components list of sub components inside other nodes 2`] = `
 `;
 
 exports[`list of components reconciliation alg works for t-foreach in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -143,7 +143,7 @@ exports[`list of components reconciliation alg works for t-foreach in t-foreach
 `;
 
 exports[`list of components reconciliation alg works for t-foreach in t-foreach 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -157,7 +157,7 @@ exports[`list of components reconciliation alg works for t-foreach in t-foreach
 `;
 
 exports[`list of components reconciliation alg works for t-foreach in t-foreach, 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -191,7 +191,7 @@ exports[`list of components reconciliation alg works for t-foreach in t-foreach,
 `;
 
 exports[`list of components reconciliation alg works for t-foreach in t-foreach, 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -205,7 +205,7 @@ exports[`list of components reconciliation alg works for t-foreach in t-foreach,
 `;
 
 exports[`list of components simple list 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -224,7 +224,7 @@ exports[`list of components simple list 1`] = `
 `;
 
 exports[`list of components simple list 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -238,7 +238,7 @@ exports[`list of components simple list 2`] = `
 `;
 
 exports[`list of components sub components rendered in a loop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -260,7 +260,7 @@ exports[`list of components sub components rendered in a loop 1`] = `
 `;
 
 exports[`list of components sub components rendered in a loop 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -274,7 +274,7 @@ exports[`list of components sub components rendered in a loop 2`] = `
 `;
 
 exports[`list of components sub components with some state rendered in a loop 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -296,7 +296,7 @@ exports[`list of components sub components with some state rendered in a loop 1`
 `;
 
 exports[`list of components sub components with some state rendered in a loop 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -310,7 +310,7 @@ exports[`list of components sub components with some state rendered in a loop 2`
 `;
 
 exports[`list of components switch component position 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -332,7 +332,7 @@ exports[`list of components switch component position 1`] = `
 `;
 
 exports[`list of components switch component position 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -346,7 +346,7 @@ exports[`list of components switch component position 2`] = `
 `;
 
 exports[`list of components t-foreach with t-component, and update 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -369,7 +369,7 @@ exports[`list of components t-foreach with t-component, and update 1`] = `
 `;
 
 exports[`list of components t-foreach with t-component, and update 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/t_key.test.ts.snap b/tests/components/__snapshots__/t_key.test.ts.snap
index bbb6a9ff..daa1b37d 100644
--- a/tests/components/__snapshots__/t_key.test.ts.snap
+++ b/tests/components/__snapshots__/t_key.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-key t-foreach with t-key switch component position 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -24,7 +24,7 @@ exports[`t-key t-foreach with t-key switch component position 1`] = `
 `;
 
 exports[`t-key t-foreach with t-key switch component position 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -38,7 +38,7 @@ exports[`t-key t-foreach with t-key switch component position 2`] = `
 `;
 
 exports[`t-key t-key on Component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -50,7 +50,7 @@ exports[`t-key t-key on Component 1`] = `
 `;
 
 exports[`t-key t-key on Component 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -64,7 +64,7 @@ exports[`t-key t-key on Component 2`] = `
 `;
 
 exports[`t-key t-key on Component as a function 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -79,7 +79,7 @@ exports[`t-key t-key on Component as a function 1`] = `
 `;
 
 exports[`t-key t-key on Component as a function 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -93,7 +93,7 @@ exports[`t-key t-key on Component as a function 2`] = `
 `;
 
 exports[`t-key t-key on multiple Components 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -110,7 +110,7 @@ exports[`t-key t-key on multiple Components 1`] = `
 `;
 
 exports[`t-key t-key on multiple Components 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -124,12 +124,12 @@ exports[`t-key t-key on multiple Components 2`] = `
 `;
 
 exports[`t-key t-key on multiple Components with t-call 1 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { isBoundary, withDefault, setContextValue, getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`calledTemplate\`);
-  const callTemplate_2 = getTemplate(\`calledTemplate\`);
+  let { isBoundary, withDefault, setContextValue } = helpers;
+  const callTemplate_1 = app.getTemplate(\`calledTemplate\`);
+  const callTemplate_2 = app.getTemplate(\`calledTemplate\`);
   
   let block1 = createBlock(\`<span><block-child-0/><block-child-1/></span>\`);
   
@@ -151,7 +151,7 @@ exports[`t-key t-key on multiple Components with t-call 1 1`] = `
 `;
 
 exports[`t-key t-key on multiple Components with t-call 1 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -163,7 +163,7 @@ exports[`t-key t-key on multiple Components with t-call 1 2`] = `
 `;
 
 exports[`t-key t-key on multiple Components with t-call 1 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -177,11 +177,10 @@ exports[`t-key t-key on multiple Components with t-call 1 3`] = `
 `;
 
 exports[`t-key t-key on multiple Components with t-call 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { getTemplate } = helpers;
-  const callTemplate_1 = getTemplate(\`calledTemplate\`);
+  const callTemplate_1 = app.getTemplate(\`calledTemplate\`);
   
   let block1 = createBlock(\`<span><block-child-0/></span>\`);
   
@@ -193,7 +192,7 @@ exports[`t-key t-key on multiple Components with t-call 2 1`] = `
 `;
 
 exports[`t-key t-key on multiple Components with t-call 2 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -208,7 +207,7 @@ exports[`t-key t-key on multiple Components with t-call 2 2`] = `
 `;
 
 exports[`t-key t-key on multiple Components with t-call 2 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/t_model.test.ts.snap b/tests/components/__snapshots__/t_model.test.ts.snap
index 48afad5e..76b9fb87 100644
--- a/tests/components/__snapshots__/t_model.test.ts.snap
+++ b/tests/components/__snapshots__/t_model.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-model directive .lazy modifier 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -20,7 +20,7 @@ exports[`t-model directive .lazy modifier 1`] = `
 `;
 
 exports[`t-model directive .number modifier 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -39,7 +39,7 @@ exports[`t-model directive .number modifier 1`] = `
 `;
 
 exports[`t-model directive .trim modifier 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -58,7 +58,7 @@ exports[`t-model directive .trim modifier 1`] = `
 `;
 
 exports[`t-model directive basic use, on an input 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -77,7 +77,7 @@ exports[`t-model directive basic use, on an input 1`] = `
 `;
 
 exports[`t-model directive basic use, on an input with bracket expression 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -96,7 +96,7 @@ exports[`t-model directive basic use, on an input with bracket expression 1`] =
 `;
 
 exports[`t-model directive basic use, on another key in component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -115,7 +115,7 @@ exports[`t-model directive basic use, on another key in component 1`] = `
 `;
 
 exports[`t-model directive can also define t-on directive on same event, part 1 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -134,7 +134,7 @@ exports[`t-model directive can also define t-on directive on same event, part 1
 `;
 
 exports[`t-model directive can also define t-on directive on same event, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -163,7 +163,7 @@ exports[`t-model directive can also define t-on directive on same event, part 2
 `;
 
 exports[`t-model directive following a scope protecting directive (e.g. t-set) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, toNumber } = helpers;
@@ -184,7 +184,7 @@ exports[`t-model directive following a scope protecting directive (e.g. t-set) 1
 `;
 
 exports[`t-model directive in a t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, toNumber, withKey } = helpers;
@@ -211,7 +211,7 @@ exports[`t-model directive in a t-foreach 1`] = `
 `;
 
 exports[`t-model directive in a t-foreach, part 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, toNumber, withKey } = helpers;
@@ -239,7 +239,7 @@ exports[`t-model directive in a t-foreach, part 2 1`] = `
 `;
 
 exports[`t-model directive in a t-foreach, part 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, toNumber, withKey } = helpers;
@@ -267,7 +267,7 @@ exports[`t-model directive in a t-foreach, part 3 1`] = `
 `;
 
 exports[`t-model directive on a select 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -286,7 +286,7 @@ exports[`t-model directive on a select 1`] = `
 `;
 
 exports[`t-model directive on a select, initial state 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -304,7 +304,7 @@ exports[`t-model directive on a select, initial state 1`] = `
 `;
 
 exports[`t-model directive on a sub state key 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -323,7 +323,7 @@ exports[`t-model directive on a sub state key 1`] = `
 `;
 
 exports[`t-model directive on an input type=radio 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -346,7 +346,7 @@ exports[`t-model directive on an input type=radio 1`] = `
 `;
 
 exports[`t-model directive on an input type=radio, with initial value 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -368,7 +368,7 @@ exports[`t-model directive on an input type=radio, with initial value 1`] = `
 `;
 
 exports[`t-model directive on an input, type=checkbox 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -392,7 +392,7 @@ exports[`t-model directive on an input, type=checkbox 1`] = `
 `;
 
 exports[`t-model directive on an textarea 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -411,7 +411,7 @@ exports[`t-model directive on an textarea 1`] = `
 `;
 
 exports[`t-model directive t-model on an input with an undefined value 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -429,7 +429,7 @@ exports[`t-model directive t-model on an input with an undefined value 1`] = `
 `;
 
 exports[`t-model directive t-model on select with static options 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -450,7 +450,7 @@ exports[`t-model directive t-model on select with static options 1`] = `
 `;
 
 exports[`t-model directive t-model with dynamic values on select options -- 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -474,7 +474,7 @@ exports[`t-model directive t-model with dynamic values on select options -- 2 1`
 `;
 
 exports[`t-model directive t-model with dynamic values on select options -- 3 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -497,7 +497,7 @@ exports[`t-model directive t-model with dynamic values on select options -- 3 1`
 `;
 
 exports[`t-model directive t-model with dynamic values on select options 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -521,7 +521,7 @@ exports[`t-model directive t-model with dynamic values on select options 1`] = `
 `;
 
 exports[`t-model directive t-model with dynamic values on select options in foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber, prepareList, withKey } = helpers;
@@ -551,7 +551,7 @@ exports[`t-model directive t-model with dynamic values on select options in fore
 `;
 
 exports[`t-model directive two inputs in a div alternating with a t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
@@ -582,7 +582,7 @@ exports[`t-model directive two inputs in a div alternating with a t-if 1`] = `
 `;
 
 exports[`t-model directive with expression having a changing key 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { toNumber } = helpers;
diff --git a/tests/components/__snapshots__/t_on.test.ts.snap b/tests/components/__snapshots__/t_on.test.ts.snap
index 99beea9b..02391709 100644
--- a/tests/components/__snapshots__/t_on.test.ts.snap
+++ b/tests/components/__snapshots__/t_on.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-on t-on expression captured in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, prepareList, withKey } = helpers;
@@ -31,7 +31,7 @@ exports[`t-on t-on expression captured in t-foreach 1`] = `
 `;
 
 exports[`t-on t-on expression in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -60,7 +60,7 @@ exports[`t-on t-on expression in t-foreach 1`] = `
 `;
 
 exports[`t-on t-on expression in t-foreach with t-set 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, prepareList, withKey } = helpers;
@@ -94,7 +94,7 @@ exports[`t-on t-on expression in t-foreach with t-set 1`] = `
 `;
 
 exports[`t-on t-on method call in t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { prepareList, withKey } = helpers;
@@ -122,7 +122,7 @@ exports[`t-on t-on method call in t-foreach 1`] = `
 `;
 
 exports[`t-on t-on on component next to t-on on div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { createCatcher } = helpers;
@@ -140,7 +140,7 @@ exports[`t-on t-on on component next to t-on on div 1`] = `
 `;
 
 exports[`t-on t-on on component next to t-on on div 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -154,7 +154,7 @@ exports[`t-on t-on on component next to t-on on div 2`] = `
 `;
 
 exports[`t-on t-on on components 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { createCatcher } = helpers;
@@ -168,7 +168,7 @@ exports[`t-on t-on on components 1`] = `
 `;
 
 exports[`t-on t-on on components 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -182,7 +182,7 @@ exports[`t-on t-on on components 2`] = `
 `;
 
 exports[`t-on t-on on components, variation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { createCatcher } = helpers;
@@ -199,7 +199,7 @@ exports[`t-on t-on on components, variation 1`] = `
 `;
 
 exports[`t-on t-on on components, variation 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -213,7 +213,7 @@ exports[`t-on t-on on components, variation 2`] = `
 `;
 
 exports[`t-on t-on on destroyed components 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -230,7 +230,7 @@ exports[`t-on t-on on destroyed components 1`] = `
 `;
 
 exports[`t-on t-on on destroyed components 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -244,7 +244,7 @@ exports[`t-on t-on on destroyed components 2`] = `
 `;
 
 exports[`t-on t-on on t-set-slots 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, createCatcher, markRaw } = helpers;
@@ -272,7 +272,7 @@ exports[`t-on t-on on t-set-slots 1`] = `
 `;
 
 exports[`t-on t-on on t-set-slots 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -284,7 +284,7 @@ exports[`t-on t-on on t-set-slots 2`] = `
 `;
 
 exports[`t-on t-on on t-slots 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -302,7 +302,7 @@ exports[`t-on t-on on t-slots 1`] = `
 `;
 
 exports[`t-on t-on on t-slots 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot, createCatcher } = helpers;
diff --git a/tests/components/__snapshots__/t_props.test.ts.snap b/tests/components/__snapshots__/t_props.test.ts.snap
index c638645c..b0b044ef 100644
--- a/tests/components/__snapshots__/t_props.test.ts.snap
+++ b/tests/components/__snapshots__/t_props.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-props basic use 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -15,7 +15,7 @@ exports[`t-props basic use 1`] = `
 `;
 
 exports[`t-props basic use 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -29,7 +29,7 @@ exports[`t-props basic use 2`] = `
 `;
 
 exports[`t-props child receives a copy of the t-props object, not the original 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -40,7 +40,7 @@ exports[`t-props child receives a copy of the t-props object, not the original 1
 `;
 
 exports[`t-props child receives a copy of the t-props object, not the original 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -53,7 +53,7 @@ exports[`t-props child receives a copy of the t-props object, not the original 2
 `;
 
 exports[`t-props t-props and other props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -67,7 +67,7 @@ exports[`t-props t-props and other props 1`] = `
 `;
 
 exports[`t-props t-props and other props 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -82,7 +82,7 @@ exports[`t-props t-props and other props 2`] = `
 `;
 
 exports[`t-props t-props only 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -96,7 +96,7 @@ exports[`t-props t-props only 1`] = `
 `;
 
 exports[`t-props t-props only 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -110,7 +110,7 @@ exports[`t-props t-props only 2`] = `
 `;
 
 exports[`t-props t-props with props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -124,7 +124,7 @@ exports[`t-props t-props with props 1`] = `
 `;
 
 exports[`t-props t-props with props 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
diff --git a/tests/components/__snapshots__/t_set.test.ts.snap b/tests/components/__snapshots__/t_set.test.ts.snap
index 9e70c221..e273da0d 100644
--- a/tests/components/__snapshots__/t_set.test.ts.snap
+++ b/tests/components/__snapshots__/t_set.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`t-set slot setted value (with t-set) not accessible with t-esc 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue, capture, markRaw } = helpers;
@@ -29,7 +29,7 @@ exports[`t-set slot setted value (with t-set) not accessible with t-esc 1`] = `
 `;
 
 exports[`t-set slot setted value (with t-set) not accessible with t-esc 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -48,7 +48,7 @@ exports[`t-set slot setted value (with t-set) not accessible with t-esc 2`] = `
 `;
 
 exports[`t-set slots with a t-set with a component in body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, isBoundary, withDefault, LazyValue, safeOutput, markRaw } = helpers;
@@ -74,7 +74,7 @@ exports[`t-set slots with a t-set with a component in body 1`] = `
 `;
 
 exports[`t-set slots with a t-set with a component in body 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -88,7 +88,7 @@ exports[`t-set slots with a t-set with a component in body 2`] = `
 `;
 
 exports[`t-set slots with a t-set with a component in body 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -99,7 +99,7 @@ exports[`t-set slots with a t-set with a component in body 3`] = `
 `;
 
 exports[`t-set slots with an t-set with a component in body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, isBoundary, withDefault, LazyValue, safeOutput, markRaw } = helpers;
@@ -129,7 +129,7 @@ exports[`t-set slots with an t-set with a component in body 1`] = `
 `;
 
 exports[`t-set slots with an t-set with a component in body 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -143,7 +143,7 @@ exports[`t-set slots with an t-set with a component in body 2`] = `
 `;
 
 exports[`t-set slots with an t-set with a component in body 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -154,7 +154,7 @@ exports[`t-set slots with an t-set with a component in body 3`] = `
 `;
 
 exports[`t-set slots with an unused t-set with a component in body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { capture, isBoundary, withDefault, LazyValue, markRaw } = helpers;
@@ -178,7 +178,7 @@ exports[`t-set slots with an unused t-set with a component in body 1`] = `
 `;
 
 exports[`t-set slots with an unused t-set with a component in body 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { callSlot } = helpers;
@@ -192,7 +192,7 @@ exports[`t-set slots with an unused t-set with a component in body 2`] = `
 `;
 
 exports[`t-set t-set can't alter component even if key in component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -211,7 +211,7 @@ exports[`t-set t-set can't alter component even if key in component 1`] = `
 `;
 
 exports[`t-set t-set can't alter component if key not in component 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -230,7 +230,7 @@ exports[`t-set t-set can't alter component if key not in component 1`] = `
 `;
 
 exports[`t-set t-set in t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -255,7 +255,7 @@ exports[`t-set t-set in t-if 1`] = `
 `;
 
 exports[`t-set t-set not altered by child comp 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -275,7 +275,7 @@ exports[`t-set t-set not altered by child comp 1`] = `
 `;
 
 exports[`t-set t-set not altered by child comp 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -294,7 +294,7 @@ exports[`t-set t-set not altered by child comp 2`] = `
 `;
 
 exports[`t-set t-set outside modified in t-if 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, setContextValue } = helpers;
@@ -320,7 +320,7 @@ exports[`t-set t-set outside modified in t-if 1`] = `
 `;
 
 exports[`t-set t-set with a component in body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue, safeOutput } = helpers;
@@ -342,7 +342,7 @@ exports[`t-set t-set with a component in body 1`] = `
 `;
 
 exports[`t-set t-set with a component in body 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -353,7 +353,7 @@ exports[`t-set t-set with a component in body 2`] = `
 `;
 
 exports[`t-set t-set with something in body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { isBoundary, withDefault, LazyValue, safeOutput } = helpers;
diff --git a/tests/helpers.ts b/tests/helpers.ts
index e5c5b973..5b93970b 100644
--- a/tests/helpers.ts
+++ b/tests/helpers.ts
@@ -92,7 +92,7 @@ export function renderToBdom(template: string, context: any = {}, node?: any): B
     snapshottedTemplates.add(template);
     expect(fn.toString()).toMatchSnapshot();
   }
-  return fn(blockDom, helpers)(context, node);
+  return fn(null as any, blockDom, helpers)(context, node);
 }
 
 export function renderToString(template: string, context: any = {}, node?: any): string {
diff --git a/tests/misc/__snapshots__/portal.test.ts.snap b/tests/misc/__snapshots__/portal.test.ts.snap
index 5096ab47..18193e46 100644
--- a/tests/misc/__snapshots__/portal.test.ts.snap
+++ b/tests/misc/__snapshots__/portal.test.ts.snap
@@ -1,10 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Portal Add and remove portals 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, Portal, capture, withKey } = helpers;
+  let { prepareList, capture, withKey } = helpers;
+  const Portal = app.Portal;
   
   function slot1(ctx, node, key = \\"\\") {
     const b3 = text(\` Portal\`);
@@ -27,10 +28,11 @@ exports[`Portal Add and remove portals 1`] = `
 `;
 
 exports[`Portal Add and remove portals on div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, Portal, capture, withKey } = helpers;
+  let { prepareList, capture, withKey } = helpers;
+  const Portal = app.Portal;
   
   let block2 = createBlock(\`<div> Portal<block-text-0/></div>\`);
   
@@ -54,10 +56,11 @@ exports[`Portal Add and remove portals on div 1`] = `
 `;
 
 exports[`Portal Add and remove portals with t-foreach 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, Portal, capture, withKey } = helpers;
+  let { prepareList, capture, withKey } = helpers;
+  const Portal = app.Portal;
   
   let block2 = createBlock(\`<div><block-text-0/><block-child-0/></div>\`);
   
@@ -84,10 +87,11 @@ exports[`Portal Add and remove portals with t-foreach 1`] = `
 `;
 
 exports[`Portal Add and remove portals with t-foreach and destroy 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, Portal, capture, withKey } = helpers;
+  let { prepareList, capture, withKey } = helpers;
+  const Portal = app.Portal;
   
   let block2 = createBlock(\`<div><block-text-0/><block-child-0/></div>\`);
   
@@ -114,10 +118,11 @@ exports[`Portal Add and remove portals with t-foreach and destroy 1`] = `
 `;
 
 exports[`Portal Add and remove portals with t-foreach inside div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, Portal, capture, withKey } = helpers;
+  let { prepareList, capture, withKey } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block3 = createBlock(\`<div><block-text-0/><block-child-0/></div>\`);
@@ -146,7 +151,7 @@ exports[`Portal Add and remove portals with t-foreach inside div 1`] = `
 `;
 
 exports[`Portal Portal composed with t-slot 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   let { markRaw } = helpers;
@@ -165,10 +170,11 @@ exports[`Portal Portal composed with t-slot 1`] = `
 `;
 
 exports[`Portal Portal composed with t-slot 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal, callSlot } = helpers;
+  let { callSlot } = helpers;
+  const Portal = app.Portal;
   
   function slot1(ctx, node, key = \\"\\") {
     return callSlot(ctx, node, key, 'default', false, null);
@@ -181,7 +187,7 @@ exports[`Portal Portal composed with t-slot 2`] = `
 `;
 
 exports[`Portal Portal composed with t-slot 3`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -195,10 +201,10 @@ exports[`Portal Portal composed with t-slot 3`] = `
 `;
 
 exports[`Portal basic use of portal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><span>1</span><block-child-0/></div>\`);
   let block2 = createBlock(\`<p>2</p>\`);
@@ -215,10 +221,10 @@ exports[`Portal basic use of portal 1`] = `
 `;
 
 exports[`Portal basic use of portal in dev mode 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><span>1</span><block-child-0/></div>\`);
   let block2 = createBlock(\`<p>2</p>\`);
@@ -235,10 +241,10 @@ exports[`Portal basic use of portal in dev mode 1`] = `
 `;
 
 exports[`Portal basic use of portal on div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><span>1</span><block-child-0/></div>\`);
   let block2 = createBlock(\`<div><p>2</p></div>\`);
@@ -255,10 +261,10 @@ exports[`Portal basic use of portal on div 1`] = `
 `;
 
 exports[`Portal basic use of portal, variation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><span>1</span><block-child-0/></div>\`);
   let block2 = createBlock(\`<p>2</p>\`);
@@ -275,10 +281,10 @@ exports[`Portal basic use of portal, variation 1`] = `
 `;
 
 exports[`Portal conditional use of Portal (with sub Component) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block2 = createBlock(\`<span>1</span>\`);
   
@@ -298,7 +304,7 @@ exports[`Portal conditional use of Portal (with sub Component) 1`] = `
 `;
 
 exports[`Portal conditional use of Portal (with sub Component) 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -312,10 +318,10 @@ exports[`Portal conditional use of Portal (with sub Component) 2`] = `
 `;
 
 exports[`Portal conditional use of Portal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block2 = createBlock(\`<span>1</span>\`);
   let block3 = createBlock(\`<p>2</p>\`);
@@ -336,7 +342,7 @@ exports[`Portal conditional use of Portal 1`] = `
 `;
 
 exports[`Portal conditional use of Portal with child and div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -351,10 +357,11 @@ exports[`Portal conditional use of Portal with child and div 1`] = `
 `;
 
 exports[`Portal conditional use of Portal with child and div 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, Portal, capture, withKey } = helpers;
+  let { prepareList, capture, withKey } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><span>hasPortal</span><block-child-0/></div>\`);
   let block3 = createBlock(\`<p>thePortal</p>\`);
@@ -379,7 +386,7 @@ exports[`Portal conditional use of Portal with child and div 2`] = `
 `;
 
 exports[`Portal conditional use of Portal with child and div, variation 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -397,10 +404,11 @@ exports[`Portal conditional use of Portal with child and div, variation 1`] = `
 `;
 
 exports[`Portal conditional use of Portal with child and div, variation 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { prepareList, Portal, capture, withKey } = helpers;
+  let { prepareList, capture, withKey } = helpers;
+  const Portal = app.Portal;
   
   let block2 = createBlock(\`<span>hasPortal</span>\`);
   let block4 = createBlock(\`<p>thePortal</p>\`);
@@ -426,10 +434,10 @@ exports[`Portal conditional use of Portal with child and div, variation 2`] = `
 `;
 
 exports[`Portal conditional use of Portal with div 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block2 = createBlock(\`<div><span>hasPortal</span><block-child-0/></div>\`);
   let block3 = createBlock(\`<p>thePortal</p>\`);
@@ -450,10 +458,10 @@ exports[`Portal conditional use of Portal with div 1`] = `
 `;
 
 exports[`Portal lifecycle hooks of portal sub component are properly called 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/><block-child-0/></div>\`);
   
@@ -472,7 +480,7 @@ exports[`Portal lifecycle hooks of portal sub component are properly called 1`]
 `;
 
 exports[`Portal lifecycle hooks of portal sub component are properly called 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -486,10 +494,10 @@ exports[`Portal lifecycle hooks of portal sub component are properly called 2`]
 `;
 
 exports[`Portal portal could have dynamically no content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block3 = createBlock(\`<span><block-text-0/></span>\`);
@@ -511,10 +519,10 @@ exports[`Portal portal could have dynamically no content 1`] = `
 `;
 
 exports[`Portal portal destroys on crash 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -530,7 +538,7 @@ exports[`Portal portal destroys on crash 1`] = `
 `;
 
 exports[`Portal portal destroys on crash 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -544,10 +552,10 @@ exports[`Portal portal destroys on crash 2`] = `
 `;
 
 exports[`Portal portal with child and props 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -563,7 +571,7 @@ exports[`Portal portal with child and props 1`] = `
 `;
 
 exports[`Portal portal with child and props 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -577,10 +585,10 @@ exports[`Portal portal with child and props 2`] = `
 `;
 
 exports[`Portal portal with dynamic body 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block3 = createBlock(\`<span><block-text-0/></span>\`);
@@ -605,10 +613,10 @@ exports[`Portal portal with dynamic body 1`] = `
 `;
 
 exports[`Portal portal with many children 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block3 = createBlock(\`<div>1</div>\`);
@@ -628,10 +636,10 @@ exports[`Portal portal with many children 1`] = `
 `;
 
 exports[`Portal portal with no content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -651,10 +659,10 @@ exports[`Portal portal with no content 1`] = `
 `;
 
 exports[`Portal portal with only text as content 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -670,10 +678,10 @@ exports[`Portal portal with only text as content 1`] = `
 `;
 
 exports[`Portal portal with target not in dom 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block2 = createBlock(\`<div>2</div>\`);
@@ -690,10 +698,10 @@ exports[`Portal portal with target not in dom 1`] = `
 `;
 
 exports[`Portal portal's parent's env is not polluted 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -709,7 +717,7 @@ exports[`Portal portal's parent's env is not polluted 1`] = `
 `;
 
 exports[`Portal portal's parent's env is not polluted 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -722,7 +730,7 @@ exports[`Portal portal's parent's env is not polluted 2`] = `
 `;
 
 exports[`Portal simple catchError with portal 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
   
@@ -741,10 +749,10 @@ exports[`Portal simple catchError with portal 1`] = `
 `;
 
 exports[`Portal simple catchError with portal 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><span>1</span><block-child-0/></div>\`);
   let block2 = createBlock(\`<p><block-text-0/></p>\`);
@@ -762,10 +770,10 @@ exports[`Portal simple catchError with portal 2`] = `
 `;
 
 exports[`Portal with target in template (after portal) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><span>1</span><block-child-0/><div id=\\"local-target\\"/></div>\`);
   let block2 = createBlock(\`<p>2</p>\`);
@@ -782,10 +790,10 @@ exports[`Portal with target in template (after portal) 1`] = `
 `;
 
 exports[`Portal with target in template (before portal) 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><div id=\\"local-target\\"/><span>1</span><block-child-0/></div>\`);
   let block2 = createBlock(\`<p>2</p>\`);
@@ -802,10 +810,10 @@ exports[`Portal with target in template (before portal) 1`] = `
 `;
 
 exports[`Portal: Props validation target must be a valid selector 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block2 = createBlock(\`<div>2</div>\`);
@@ -822,10 +830,10 @@ exports[`Portal: Props validation target must be a valid selector 1`] = `
 `;
 
 exports[`Portal: Props validation target must be a valid selector 2 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   let block2 = createBlock(\`<div>2</div>\`);
@@ -842,10 +850,10 @@ exports[`Portal: Props validation target must be a valid selector 2 1`] = `
 `;
 
 exports[`Portal: UI/UX focus is kept across re-renders 1`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
-  let { Portal } = helpers;
+  const Portal = app.Portal;
   
   let block1 = createBlock(\`<div><block-child-0/></div>\`);
   
@@ -861,7 +869,7 @@ exports[`Portal: UI/UX focus is kept across re-renders 1`] = `
 `;
 
 exports[`Portal: UI/UX focus is kept across re-renders 2`] = `
-"function anonymous(bdom, helpers
+"function anonymous(app, bdom, helpers
 ) {
   let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;