diff --git a/src/generators/nodes/AwaitBlock.ts b/src/generators/nodes/AwaitBlock.ts
index 03e2b0d80c..fce936ad0d 100644
--- a/src/generators/nodes/AwaitBlock.ts
+++ b/src/generators/nodes/AwaitBlock.ts
@@ -2,7 +2,6 @@ import deindent from '../../utils/deindent';
 import Node from './shared/Node';
 import { DomGenerator } from '../dom/index';
 import Block from '../dom/Block';
-import visitAwaitBlock from '../dom/visitors/AwaitBlock';
 import PendingBlock from './PendingBlock';
 import ThenBlock from './ThenBlock';
 import CatchBlock from './CatchBlock';
@@ -12,6 +11,7 @@ import createDebuggingComment from '../../utils/createDebuggingComment';
 export default class AwaitBlock extends Node {
 	value: string;
 	error: string;
+	expression: Node;
 
 	pending: PendingBlock;
 	then: ThenBlock;
diff --git a/src/generators/nodes/Binding.ts b/src/generators/nodes/Binding.ts
index 21cdbb9c4d..308743f70b 100644
--- a/src/generators/nodes/Binding.ts
+++ b/src/generators/nodes/Binding.ts
@@ -3,6 +3,7 @@ import Element from './Element';
 import getObject from '../../utils/getObject';
 import getTailSnippet from '../../utils/getTailSnippet';
 import flattenReference from '../../utils/flattenReference';
+import { DomGenerator } from '../dom/index';
 import Block from '../dom/Block';
 import State from '../dom/State';
 
diff --git a/src/generators/nodes/CatchBlock.ts b/src/generators/nodes/CatchBlock.ts
index 85f20ec069..3d94531e3f 100644
--- a/src/generators/nodes/CatchBlock.ts
+++ b/src/generators/nodes/CatchBlock.ts
@@ -5,4 +5,5 @@ import State from '../dom/State';
 export default class CatchBlock extends Node {
 	_block: Block;
 	_state: State;
+	children: Node[];
 }
\ No newline at end of file
diff --git a/src/generators/nodes/EachBlock.ts b/src/generators/nodes/EachBlock.ts
index c50ba80049..b8a42c6bb8 100644
--- a/src/generators/nodes/EachBlock.ts
+++ b/src/generators/nodes/EachBlock.ts
@@ -4,7 +4,6 @@ import ElseBlock from './ElseBlock';
 import { DomGenerator } from '../dom/index';
 import Block from '../dom/Block';
 import State from '../dom/State';
-import visitEachBlock from '../dom/visitors/EachBlock';
 import createDebuggingComment from '../../utils/createDebuggingComment';
 
 export default class EachBlock extends Node {
diff --git a/src/generators/nodes/PendingBlock.ts b/src/generators/nodes/PendingBlock.ts
index 406361fc01..4a8a401417 100644
--- a/src/generators/nodes/PendingBlock.ts
+++ b/src/generators/nodes/PendingBlock.ts
@@ -5,4 +5,5 @@ import State from '../dom/State';
 export default class PendingBlock extends Node {
 	_block: Block;
 	_state: State;
+	children: Node[];
 }
\ No newline at end of file
diff --git a/src/generators/nodes/ThenBlock.ts b/src/generators/nodes/ThenBlock.ts
index 70f6224576..a433b5b87a 100644
--- a/src/generators/nodes/ThenBlock.ts
+++ b/src/generators/nodes/ThenBlock.ts
@@ -5,4 +5,5 @@ import State from '../dom/State';
 export default class ThenBlock extends Node {
 	_block: Block;
 	_state: State;
+	children: Node[];
 }
\ No newline at end of file
diff --git a/src/generators/nodes/shared/Node.ts b/src/generators/nodes/shared/Node.ts
index 71353d6163..8e2b82e129 100644
--- a/src/generators/nodes/shared/Node.ts
+++ b/src/generators/nodes/shared/Node.ts
@@ -7,9 +7,11 @@ export default class Node {
 	type: string;
 	start: number;
 	end: number;
+	[key: string]: any;
 
-	metadata: {
+	metadata?: {
 		dependencies: string[];
+		snippet: string;
 	};
 
 	parent: Node;