From fd984fea8f543ff62646df3c5087a0dfcbc9634a Mon Sep 17 00:00:00 2001
From: Vadym Slizov <z7zmey@gmail.com>
Date: Sun, 20 Dec 2020 11:38:13 +0200
Subject: [PATCH] refactoring: update php7 tests

---
 internal/php7/parser_test.go     | 50330 +++++++++++++++++++++++------
 internal/php7/php7.go            |   Bin 219167 -> 219246 bytes
 internal/php7/php7.y             |     8 +-
 internal/php7/php7_bench_test.go |   378 +-
 internal/php7/php7_test.go       | 19703 -----------
 5 files changed, 39857 insertions(+), 30562 deletions(-)
 delete mode 100644 internal/php7/php7_test.go

diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go
index 94835e1..6c94e47 100644
--- a/internal/php7/parser_test.go
+++ b/internal/php7/parser_test.go
@@ -1,6 +1,7 @@
 package php7_test
 
 import (
+	"github.com/z7zmey/php-parser/pkg/errors"
 	"testing"
 
 	"gotest.tools/assert"
@@ -8,69 +9,101 @@ import (
 	"github.com/z7zmey/php-parser/internal/php7"
 	"github.com/z7zmey/php-parser/internal/scanner"
 	"github.com/z7zmey/php-parser/pkg/ast"
-	"github.com/z7zmey/php-parser/pkg/ast/traverser"
-	"github.com/z7zmey/php-parser/pkg/ast/visitor"
 	"github.com/z7zmey/php-parser/pkg/position"
+	"github.com/z7zmey/php-parser/pkg/token"
 )
 
 func TestIdentifier(t *testing.T) {
 	src := `<? $foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    8,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    8,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    8,
+				},
+				Expr: &ast.ExprVariable{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    8,
+						EndPos:    7,
 					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    7,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$foo"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    7,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("$foo"),
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestPhp7ArgumentNode(t *testing.T) {
-	src := `<? 
+	src := `<?
 		foo($a, ...$b);
 		$foo($a, ...$b);
 		$foo->bar($a, ...$b);
@@ -78,729 +111,1424 @@ func TestPhp7ArgumentNode(t *testing.T) {
 		$foo::bar($a, ...$b);
 		new foo($a, ...$b);
 		/** anonymous class */
-		new class ($a, ...$b) {};
-	`
+		new class ($a, ...$b) {};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   9,
-				StartPos:  6,
-				EndPos:    186,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   9,
+			StartPos:  5,
+			EndPos:    185,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    20,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  6,
-						EndPos:    21,
+						StartPos:  5,
+						EndPos:    19,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  6,
-							EndPos:    20,
-						},
-					},
-					Function: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 2,
-								EndLine:   2,
-								StartPos:  6,
-								EndPos:    9,
-							},
+							StartPos:  5,
+							EndPos:    8,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  5,
+									EndPos:    8,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  6,
-										EndPos:    9,
+										StartPos:  5,
+										EndPos:    8,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte("\n\t\t"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   2,
+												StartPos:  2,
+												EndPos:    5,
+											},
+										},
 									},
 								},
 								Value: []byte("foo"),
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  8,
+							EndPos:    9,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
 								StartPos:  9,
-								EndPos:    20,
+								EndPos:    11,
 							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  9,
+									EndPos:    11,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  10,
-										EndPos:    12,
+										StartPos:  9,
+										EndPos:    11,
 									},
-								},
-								Variadic:    false,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 2,
-											EndLine:   2,
-											StartPos:  10,
-											EndPos:    12,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 2,
-												EndLine:   2,
-												StartPos:  10,
-												EndPos:    12,
-											},
-										},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
 										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  14,
-										EndPos:    19,
-									},
-								},
-								Variadic:    true,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
-											StartPos:  17,
-											EndPos:    19,
+											StartPos:  9,
+											EndPos:    11,
 										},
 									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 2,
-												EndLine:   2,
-												StartPos:  17,
-												EndPos:    19,
-											},
-										},
-										Value: []byte("$b"),
-									},
+									Value: []byte("$a"),
 								},
 							},
 						},
+						&ast.Argument{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  13,
+								EndPos:    18,
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  13,
+									EndPos:    16,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  12,
+											EndPos:    13,
+										},
+									},
+								},
+							},
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  16,
+									EndPos:    18,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  16,
+										EndPos:    18,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  16,
+											EndPos:    18,
+										},
+									},
+									Value: []byte("$b"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  18,
+							EndPos:    19,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  19,
+						EndPos:    20,
 					},
 				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 3,
+					EndLine:   3,
+					StartPos:  23,
+					EndPos:    39,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 3,
 						EndLine:   3,
-						StartPos:  24,
-						EndPos:    40,
+						StartPos:  23,
+						EndPos:    38,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 3,
 							EndLine:   3,
-							StartPos:  24,
-							EndPos:    39,
+							StartPos:  23,
+							EndPos:    27,
 						},
-					},
-					Function: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  24,
-								EndPos:    28,
+								StartPos:  23,
+								EndPos:    27,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$foo"),
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  24,
-									EndPos:    28,
+									StartPos:  23,
+									EndPos:    27,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   3,
+											StartPos:  20,
+											EndPos:    23,
+										},
+									},
 								},
 							},
 							Value: []byte("$foo"),
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  27,
+							EndPos:    28,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
 								StartPos:  28,
-								EndPos:    39,
+								EndPos:    30,
 							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  28,
+									EndPos:    30,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  29,
-										EndPos:    31,
+										StartPos:  28,
+										EndPos:    30,
 									},
-								},
-								Variadic:    false,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  29,
-											EndPos:    31,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 3,
-												EndLine:   3,
-												StartPos:  29,
-												EndPos:    31,
-											},
-										},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
 										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 3,
-										EndLine:   3,
-										StartPos:  33,
-										EndPos:    38,
-									},
-								},
-								Variadic:    true,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
-											StartPos:  36,
-											EndPos:    38,
+											StartPos:  28,
+											EndPos:    30,
 										},
 									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 3,
-												EndLine:   3,
-												StartPos:  36,
-												EndPos:    38,
-											},
-										},
-										Value: []byte("$b"),
-									},
+									Value: []byte("$a"),
 								},
 							},
 						},
+						&ast.Argument{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  32,
+								EndPos:    37,
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  32,
+									EndPos:    35,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  31,
+											EndPos:    32,
+										},
+									},
+								},
+							},
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  35,
+									EndPos:    37,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  35,
+										EndPos:    37,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  35,
+											EndPos:    37,
+										},
+									},
+									Value: []byte("$b"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  30,
+								EndPos:    31,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  37,
+							EndPos:    38,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  38,
+						EndPos:    39,
 					},
 				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 4,
+					EndLine:   4,
+					StartPos:  42,
+					EndPos:    63,
+				},
+				Expr: &ast.ExprMethodCall{
 					Position: &position.Position{
 						StartLine: 4,
 						EndLine:   4,
-						StartPos:  43,
-						EndPos:    64,
+						StartPos:  42,
+						EndPos:    62,
 					},
-				},
-				Expr: &ast.ExprMethodCall{
-					Node: ast.Node{
+					Var: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 4,
 							EndLine:   4,
-							StartPos:  43,
-							EndPos:    63,
+							StartPos:  42,
+							EndPos:    46,
 						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  43,
-								EndPos:    47,
+								StartPos:  42,
+								EndPos:    46,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$foo"),
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  43,
-									EndPos:    47,
+									StartPos:  42,
+									EndPos:    46,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   4,
+											StartPos:  39,
+											EndPos:    42,
+										},
+									},
 								},
 							},
 							Value: []byte("$foo"),
 						},
 					},
+					ObjectOperatorTkn: &token.Token{
+						ID:    token.T_OBJECT_OPERATOR,
+						Value: []byte("->"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  46,
+							EndPos:    48,
+						},
+					},
 					Method: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  48,
+							EndPos:    51,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("bar"),
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  49,
-								EndPos:    52,
+								StartPos:  48,
+								EndPos:    51,
 							},
 						},
 						Value: []byte("bar"),
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  51,
+							EndPos:    52,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
 								StartPos:  52,
-								EndPos:    63,
+								EndPos:    54,
 							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  52,
+									EndPos:    54,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
-										StartPos:  53,
-										EndPos:    55,
+										StartPos:  52,
+										EndPos:    54,
 									},
-								},
-								IsReference: false,
-								Variadic:    false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  53,
-											EndPos:    55,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 4,
-												EndLine:   4,
-												StartPos:  53,
-												EndPos:    55,
-											},
-										},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
 										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  57,
-										EndPos:    62,
-									},
-								},
-								Variadic:    true,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  60,
-											EndPos:    62,
+											StartPos:  52,
+											EndPos:    54,
 										},
 									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 4,
-												EndLine:   4,
-												StartPos:  60,
-												EndPos:    62,
-											},
-										},
-										Value: []byte("$b"),
-									},
+									Value: []byte("$a"),
 								},
 							},
 						},
+						&ast.Argument{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  56,
+								EndPos:    61,
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  56,
+									EndPos:    59,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  55,
+											EndPos:    56,
+										},
+									},
+								},
+							},
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  59,
+									EndPos:    61,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  59,
+										EndPos:    61,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  59,
+											EndPos:    61,
+										},
+									},
+									Value: []byte("$b"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  54,
+								EndPos:    55,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  61,
+							EndPos:    62,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  62,
+						EndPos:    63,
 					},
 				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 5,
+					EndLine:   5,
+					StartPos:  66,
+					EndPos:    86,
+				},
+				Expr: &ast.ExprStaticCall{
 					Position: &position.Position{
 						StartLine: 5,
 						EndLine:   5,
-						StartPos:  67,
-						EndPos:    87,
+						StartPos:  66,
+						EndPos:    85,
 					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
+					Class: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 5,
 							EndLine:   5,
-							StartPos:  67,
-							EndPos:    86,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 5,
-								EndLine:   5,
-								StartPos:  67,
-								EndPos:    70,
-							},
+							StartPos:  66,
+							EndPos:    69,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  66,
+									EndPos:    69,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  67,
-										EndPos:    70,
+										StartPos:  66,
+										EndPos:    69,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte("\n\t\t"),
+											Position: &position.Position{
+												StartLine: 4,
+												EndLine:   5,
+												StartPos:  63,
+												EndPos:    66,
+											},
+										},
 									},
 								},
 								Value: []byte("foo"),
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  69,
+							EndPos:    71,
+						},
+					},
 					Call: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  71,
+							EndPos:    74,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("bar"),
 							Position: &position.Position{
 								StartLine: 5,
 								EndLine:   5,
-								StartPos:  72,
-								EndPos:    75,
+								StartPos:  71,
+								EndPos:    74,
 							},
 						},
 						Value: []byte("bar"),
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  74,
+							EndPos:    75,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 5,
 								EndLine:   5,
 								StartPos:  75,
-								EndPos:    86,
+								EndPos:    77,
 							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  75,
+									EndPos:    77,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
-										StartPos:  76,
-										EndPos:    78,
+										StartPos:  75,
+										EndPos:    77,
 									},
-								},
-								Variadic:    false,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 5,
-											EndLine:   5,
-											StartPos:  76,
-											EndPos:    78,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 5,
-												EndLine:   5,
-												StartPos:  76,
-												EndPos:    78,
-											},
-										},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
 										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  80,
-										EndPos:    85,
-									},
-								},
-								Variadic:    true,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  83,
-											EndPos:    85,
+											StartPos:  75,
+											EndPos:    77,
 										},
 									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 5,
-												EndLine:   5,
-												StartPos:  83,
-												EndPos:    85,
-											},
-										},
-										Value: []byte("$b"),
-									},
+									Value: []byte("$a"),
 								},
 							},
 						},
+						&ast.Argument{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  79,
+								EndPos:    84,
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  79,
+									EndPos:    82,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  78,
+											EndPos:    79,
+										},
+									},
+								},
+							},
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  82,
+									EndPos:    84,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 5,
+										EndLine:   5,
+										StartPos:  82,
+										EndPos:    84,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  82,
+											EndPos:    84,
+										},
+									},
+									Value: []byte("$b"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  77,
+								EndPos:    78,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  84,
+							EndPos:    85,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  85,
+						EndPos:    86,
 					},
 				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 6,
+					EndLine:   6,
+					StartPos:  89,
+					EndPos:    110,
+				},
+				Expr: &ast.ExprStaticCall{
 					Position: &position.Position{
 						StartLine: 6,
 						EndLine:   6,
-						StartPos:  90,
-						EndPos:    111,
+						StartPos:  89,
+						EndPos:    109,
 					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
+					Class: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 6,
 							EndLine:   6,
-							StartPos:  90,
-							EndPos:    110,
+							StartPos:  89,
+							EndPos:    93,
 						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
-								StartPos:  90,
-								EndPos:    94,
+								StartPos:  89,
+								EndPos:    93,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$foo"),
 								Position: &position.Position{
 									StartLine: 6,
 									EndLine:   6,
-									StartPos:  90,
-									EndPos:    94,
+									StartPos:  89,
+									EndPos:    93,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   6,
+											StartPos:  86,
+											EndPos:    89,
+										},
+									},
 								},
 							},
 							Value: []byte("$foo"),
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  93,
+							EndPos:    95,
+						},
+					},
 					Call: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  95,
+							EndPos:    98,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("bar"),
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
-								StartPos:  96,
-								EndPos:    99,
+								StartPos:  95,
+								EndPos:    98,
 							},
 						},
 						Value: []byte("bar"),
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  98,
+							EndPos:    99,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 6,
 								EndLine:   6,
 								StartPos:  99,
-								EndPos:    110,
+								EndPos:    101,
 							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  99,
+									EndPos:    101,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 6,
 										EndLine:   6,
-										StartPos:  100,
-										EndPos:    102,
+										StartPos:  99,
+										EndPos:    101,
 									},
-								},
-								Variadic:    false,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 6,
-											EndLine:   6,
-											StartPos:  100,
-											EndPos:    102,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 6,
-												EndLine:   6,
-												StartPos:  100,
-												EndPos:    102,
-											},
-										},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
 										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 6,
-										EndLine:   6,
-										StartPos:  104,
-										EndPos:    109,
-									},
-								},
-								Variadic:    true,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
 										Position: &position.Position{
 											StartLine: 6,
 											EndLine:   6,
-											StartPos:  107,
-											EndPos:    109,
+											StartPos:  99,
+											EndPos:    101,
 										},
 									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 6,
-												EndLine:   6,
-												StartPos:  107,
-												EndPos:    109,
-											},
-										},
-										Value: []byte("$b"),
-									},
+									Value: []byte("$a"),
 								},
 							},
 						},
+						&ast.Argument{
+							Position: &position.Position{
+								StartLine: 6,
+								EndLine:   6,
+								StartPos:  103,
+								EndPos:    108,
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  103,
+									EndPos:    106,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 6,
+											EndLine:   6,
+											StartPos:  102,
+											EndPos:    103,
+										},
+									},
+								},
+							},
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  106,
+									EndPos:    108,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 6,
+										EndLine:   6,
+										StartPos:  106,
+										EndPos:    108,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
+										Position: &position.Position{
+											StartLine: 6,
+											EndLine:   6,
+											StartPos:  106,
+											EndPos:    108,
+										},
+									},
+									Value: []byte("$b"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 6,
+								EndLine:   6,
+								StartPos:  101,
+								EndPos:    102,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  108,
+							EndPos:    109,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  109,
+						EndPos:    110,
 					},
 				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 7,
+					EndLine:   7,
+					StartPos:  113,
+					EndPos:    132,
+				},
+				Expr: &ast.ExprNew{
 					Position: &position.Position{
 						StartLine: 7,
 						EndLine:   7,
-						StartPos:  114,
-						EndPos:    133,
+						StartPos:  113,
+						EndPos:    131,
 					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
+					NewTkn: &token.Token{
+						ID:    token.T_NEW,
+						Value: []byte("new"),
 						Position: &position.Position{
 							StartLine: 7,
 							EndLine:   7,
-							StartPos:  114,
-							EndPos:    132,
+							StartPos:  113,
+							EndPos:    116,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   7,
+									StartPos:  110,
+									EndPos:    113,
+								},
+							},
 						},
 					},
 					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 7,
-								EndLine:   7,
-								StartPos:  118,
-								EndPos:    121,
-							},
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  117,
+							EndPos:    120,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  117,
+									EndPos:    120,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 7,
 										EndLine:   7,
-										StartPos:  118,
-										EndPos:    121,
+										StartPos:  117,
+										EndPos:    120,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 7,
+												EndLine:   7,
+												StartPos:  116,
+												EndPos:    117,
+											},
+										},
 									},
 								},
 								Value: []byte("foo"),
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  120,
+							EndPos:    121,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 7,
 								EndLine:   7,
 								StartPos:  121,
-								EndPos:    132,
+								EndPos:    123,
+							},
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  121,
+									EndPos:    123,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 7,
+										EndLine:   7,
+										StartPos:  121,
+										EndPos:    123,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$a"),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   7,
+											StartPos:  121,
+											EndPos:    123,
+										},
+									},
+									Value: []byte("$a"),
+								},
+							},
+						},
+						&ast.Argument{
+							Position: &position.Position{
+								StartLine: 7,
+								EndLine:   7,
+								StartPos:  125,
+								EndPos:    130,
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  125,
+									EndPos:    128,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   7,
+											StartPos:  124,
+											EndPos:    125,
+										},
+									},
+								},
+							},
+							Expr: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  128,
+									EndPos:    130,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 7,
+										EndLine:   7,
+										StartPos:  128,
+										EndPos:    130,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   7,
+											StartPos:  128,
+											EndPos:    130,
+										},
+									},
+									Value: []byte("$b"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 7,
+								EndLine:   7,
+								StartPos:  123,
+								EndPos:    124,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  130,
+							EndPos:    131,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  131,
+						EndPos:    132,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 9,
+					EndLine:   9,
+					StartPos:  160,
+					EndPos:    185,
+				},
+				Expr: &ast.ExprNew{
+					Position: &position.Position{
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  160,
+						EndPos:    184,
+					},
+					NewTkn: &token.Token{
+						ID:    token.T_NEW,
+						Value: []byte("new"),
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  160,
+							EndPos:    163,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   8,
+									StartPos:  132,
+									EndPos:    135,
+								},
+							},
+							{
+								ID:    token.T_DOC_COMMENT,
+								Value: []byte("/** anonymous class */"),
+								Position: &position.Position{
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  135,
+									EndPos:    157,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 8,
+									EndLine:   9,
+									StartPos:  157,
+									EndPos:    160,
+								},
+							},
+						},
+					},
+					Class: &ast.StmtClass{
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  164,
+							EndPos:    184,
+						},
+						ClassTkn: &token.Token{
+							ID:    token.T_CLASS,
+							Value: []byte("class"),
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  164,
+								EndPos:    169,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 9,
+										EndLine:   9,
+										StartPos:  163,
+										EndPos:    164,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  170,
+								EndPos:    171,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 9,
+										EndLine:   9,
+										StartPos:  169,
+										EndPos:    170,
+									},
+								},
 							},
 						},
 						Arguments: []ast.Vertex{
 							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 7,
-										EndLine:   7,
-										StartPos:  122,
-										EndPos:    124,
-									},
+								Position: &position.Position{
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  171,
+									EndPos:    173,
 								},
-								Variadic:    false,
-								IsReference: false,
 								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 7,
-											EndLine:   7,
-											StartPos:  122,
-											EndPos:    124,
-										},
+									Position: &position.Position{
+										StartLine: 9,
+										EndLine:   9,
+										StartPos:  171,
+										EndPos:    173,
 									},
 									VarName: &ast.Identifier{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 9,
+											EndLine:   9,
+											StartPos:  171,
+											EndPos:    173,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
-												StartLine: 7,
-												EndLine:   7,
-												StartPos:  122,
-												EndPos:    124,
+												StartLine: 9,
+												EndLine:   9,
+												StartPos:  171,
+												EndPos:    173,
 											},
 										},
 										Value: []byte("$a"),
@@ -808,32 +1536,56 @@ func TestPhp7ArgumentNode(t *testing.T) {
 								},
 							},
 							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 7,
-										EndLine:   7,
-										StartPos:  126,
-										EndPos:    131,
-									},
+								Position: &position.Position{
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  175,
+									EndPos:    180,
 								},
-								Variadic:    true,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 7,
-											EndLine:   7,
-											StartPos:  129,
-											EndPos:    131,
+								VariadicTkn: &token.Token{
+									ID:    token.T_ELLIPSIS,
+									Value: []byte("..."),
+									Position: &position.Position{
+										StartLine: 9,
+										EndLine:   9,
+										StartPos:  175,
+										EndPos:    178,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 9,
+												EndLine:   9,
+												StartPos:  174,
+												EndPos:    175,
+											},
 										},
 									},
+								},
+								Expr: &ast.ExprVariable{
+									Position: &position.Position{
+										StartLine: 9,
+										EndLine:   9,
+										StartPos:  178,
+										EndPos:    180,
+									},
 									VarName: &ast.Identifier{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 9,
+											EndLine:   9,
+											StartPos:  178,
+											EndPos:    180,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$b"),
 											Position: &position.Position{
-												StartLine: 7,
-												EndLine:   7,
-												StartPos:  129,
-												EndPos:    131,
+												StartLine: 9,
+												EndLine:   9,
+												StartPos:  178,
+												EndPos:    180,
 											},
 										},
 										Value: []byte("$b"),
@@ -841,127 +1593,82 @@ func TestPhp7ArgumentNode(t *testing.T) {
 								},
 							},
 						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 9,
-						EndLine:   9,
-						StartPos:  161,
-						EndPos:    186,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 9,
-							EndLine:   9,
-							StartPos:  161,
-							EndPos:    185,
-						},
-					},
-					Class: &ast.StmtClass{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 9,
-								EndLine:   9,
-								StartPos:  165,
-								EndPos:    185,
-							},
-						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
 								Position: &position.Position{
 									StartLine: 9,
 									EndLine:   9,
-									StartPos:  171,
-									EndPos:    182,
+									StartPos:  173,
+									EndPos:    174,
 								},
 							},
-							Arguments: []ast.Vertex{
-								&ast.Argument{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 9,
-											EndLine:   9,
-											StartPos:  172,
-											EndPos:    174,
-										},
-									},
-									Variadic:    false,
-									IsReference: false,
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 9,
-												EndLine:   9,
-												StartPos:  172,
-												EndPos:    174,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 9,
-													EndLine:   9,
-													StartPos:  172,
-													EndPos:    174,
-												},
-											},
-											Value: []byte("$a"),
-										},
-									},
-								},
-								&ast.Argument{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 9,
-											EndLine:   9,
-											StartPos:  176,
-											EndPos:    181,
-										},
-									},
-									Variadic:    true,
-									IsReference: false,
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 9,
-												EndLine:   9,
-												StartPos:  179,
-												EndPos:    181,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 9,
-													EndLine:   9,
-													StartPos:  179,
-													EndPos:    181,
-												},
-											},
-											Value: []byte("$b"),
-										},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  180,
+								EndPos:    181,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  182,
+								EndPos:    183,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 9,
+										EndLine:   9,
+										StartPos:  181,
+										EndPos:    182,
 									},
 								},
 							},
 						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  183,
+								EndPos:    184,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  184,
+						EndPos:    185,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -974,66 +1681,136 @@ func TestPhp7ParameterNode(t *testing.T) {
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   5,
-				StartPos:  5,
-				EndPos:    214,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   5,
+			StartPos:  5,
+			EndPos:    214,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFunction{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    50,
+				},
+				FunctionTkn: &token.Token{
+					ID:    token.T_FUNCTION,
+					Value: []byte("function"),
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
 						StartPos:  5,
-						EndPos:    50,
+						EndPos:    13,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
 					},
 				},
 				FunctionName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  14,
+						EndPos:    17,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
 							StartPos:  14,
 							EndPos:    17,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  13,
+									EndPos:    14,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
 				Params: []ast.Vertex{
 					&ast.Parameter{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  18,
+							EndPos:    32,
+						},
+						Type: &ast.Nullable{
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
 								StartPos:  18,
-								EndPos:    32,
+								EndPos:    22,
 							},
-						},
-						Type: &ast.Nullable{
-							Node: ast.Node{
+							QuestionTkn: &token.Token{
+								ID:    token.ID(63),
+								Value: []byte("?"),
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
 									StartPos:  18,
-									EndPos:    22,
+									EndPos:    19,
 								},
 							},
 							Expr: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  19,
-										EndPos:    22,
-									},
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  19,
+									EndPos:    22,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  19,
+											EndPos:    22,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("bar"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
@@ -1047,47 +1824,79 @@ func TestPhp7ParameterNode(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  23,
+								EndPos:    27,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
 									StartPos:  23,
 									EndPos:    27,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$bar"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
 										StartPos:  23,
 										EndPos:    27,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  22,
+												EndPos:    23,
+											},
+										},
+									},
 								},
 								Value: []byte("$bar"),
 							},
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  27,
+								EndPos:    28,
+							},
+						},
 						DefaultValue: &ast.ExprConstFetch{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  28,
+								EndPos:    32,
+							},
+							Const: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
 									StartPos:  28,
 									EndPos:    32,
 								},
-							},
-							Const: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  28,
-										EndPos:    32,
-									},
-								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  28,
+											EndPos:    32,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("null"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
@@ -1102,126 +1911,271 @@ func TestPhp7ParameterNode(t *testing.T) {
 						},
 					},
 					&ast.Parameter{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  34,
+							EndPos:    46,
+						},
+						Type: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
 								StartPos:  34,
-								EndPos:    46,
-							},
-						},
-						Type: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 2,
-									EndLine:   2,
-									StartPos:  34,
-									EndPos:    37,
-								},
+								EndPos:    37,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  34,
+										EndPos:    37,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("baz"),
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
 											StartPos:  34,
 											EndPos:    37,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 2,
+													EndLine:   2,
+													StartPos:  33,
+													EndPos:    34,
+												},
+											},
+										},
 									},
 									Value: []byte("baz"),
 								},
 							},
 						},
-						Var: &ast.Reference{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 2,
-									EndLine:   2,
-									StartPos:  38,
-									EndPos:    46,
-								},
+						AmpersandTkn: &token.Token{
+							ID:    token.ID(38),
+							Value: []byte("&"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  38,
+								EndPos:    39,
 							},
-							Var: &ast.Variadic{
-								Node: ast.Node{
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  39,
+										StartPos:  37,
+										EndPos:    38,
+									},
+								},
+							},
+						},
+						VariadicTkn: &token.Token{
+							ID:    token.T_ELLIPSIS,
+							Value: []byte("..."),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  39,
+								EndPos:    42,
+							},
+						},
+						Var: &ast.ExprVariable{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  42,
+								EndPos:    46,
+							},
+							VarName: &ast.Identifier{
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  42,
+									EndPos:    46,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$baz"),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  42,
 										EndPos:    46,
 									},
 								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 2,
-											EndLine:   2,
-											StartPos:  42,
-											EndPos:    46,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 2,
-												EndLine:   2,
-												StartPos:  42,
-												EndPos:    46,
-											},
-										},
-										Value: []byte("$baz"),
-									},
-								},
+								Value: []byte("$baz"),
+							},
+						},
+					},
+				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  32,
+							EndPos:    33,
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  46,
+						EndPos:    47,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  48,
+						EndPos:    49,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  47,
+								EndPos:    48,
 							},
 						},
 					},
 				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  49,
+						EndPos:    50,
+					},
+				},
 			},
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 3,
+					EndLine:   3,
+					StartPos:  53,
+					EndPos:    117,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 3,
 						EndLine:   3,
 						StartPos:  53,
-						EndPos:    117,
+						EndPos:    58,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   3,
+								StartPos:  50,
+								EndPos:    53,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  59,
+						EndPos:    62,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 3,
 							EndLine:   3,
 							StartPos:  59,
 							EndPos:    62,
 						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 3,
-								EndLine:   3,
-								StartPos:  64,
-								EndPos:    116,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  80,
-									EndPos:    83,
+									StartPos:  58,
+									EndPos:    59,
 								},
 							},
-							Value: []byte("foo"),
+						},
+					},
+					Value: []byte("foo"),
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  63,
+						EndPos:    64,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  62,
+								EndPos:    63,
+							},
+						},
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtClassMethod{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  64,
+							EndPos:    116,
 						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  64,
+									EndPos:    70,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PUBLIC,
+									Value: []byte("public"),
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
@@ -1232,37 +2186,112 @@ func TestPhp7ParameterNode(t *testing.T) {
 								Value: []byte("public"),
 							},
 						},
+						FunctionTkn: &token.Token{
+							ID:    token.T_FUNCTION,
+							Value: []byte("function"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  71,
+								EndPos:    79,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  70,
+										EndPos:    71,
+									},
+								},
+							},
+						},
+						MethodName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  80,
+								EndPos:    83,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("foo"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  80,
+									EndPos:    83,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  79,
+											EndPos:    80,
+										},
+									},
+								},
+							},
+							Value: []byte("foo"),
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  83,
+								EndPos:    84,
+							},
+						},
 						Params: []ast.Vertex{
 							&ast.Parameter{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  84,
+									EndPos:    98,
+								},
+								Type: &ast.Nullable{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
 										StartPos:  84,
-										EndPos:    98,
+										EndPos:    88,
 									},
-								},
-								Type: &ast.Nullable{
-									Node: ast.Node{
+									QuestionTkn: &token.Token{
+										ID:    token.ID(63),
+										Value: []byte("?"),
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
 											StartPos:  84,
-											EndPos:    88,
+											EndPos:    85,
 										},
 									},
 									Expr: &ast.NameName{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 3,
-												EndLine:   3,
-												StartPos:  85,
-												EndPos:    88,
-											},
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  85,
+											EndPos:    88,
 										},
 										Parts: []ast.Vertex{
 											&ast.NameNamePart{
-												Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 3,
+													EndLine:   3,
+													StartPos:  85,
+													EndPos:    88,
+												},
+												StringTkn: &token.Token{
+													ID:    token.T_STRING,
+													Value: []byte("bar"),
 													Position: &position.Position{
 														StartLine: 3,
 														EndLine:   3,
@@ -1276,47 +2305,79 @@ func TestPhp7ParameterNode(t *testing.T) {
 									},
 								},
 								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  89,
+										EndPos:    93,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
 											StartPos:  89,
 											EndPos:    93,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$bar"),
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
 												StartPos:  89,
 												EndPos:    93,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 3,
+														EndLine:   3,
+														StartPos:  88,
+														EndPos:    89,
+													},
+												},
+											},
 										},
 										Value: []byte("$bar"),
 									},
 								},
+								EqualTkn: &token.Token{
+									ID:    token.ID(61),
+									Value: []byte("="),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  93,
+										EndPos:    94,
+									},
+								},
 								DefaultValue: &ast.ExprConstFetch{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  94,
+										EndPos:    98,
+									},
+									Const: &ast.NameName{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
 											StartPos:  94,
 											EndPos:    98,
 										},
-									},
-									Const: &ast.NameName{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 3,
-												EndLine:   3,
-												StartPos:  94,
-												EndPos:    98,
-											},
-										},
 										Parts: []ast.Vertex{
 											&ast.NameNamePart{
-												Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 3,
+													EndLine:   3,
+													StartPos:  94,
+													EndPos:    98,
+												},
+												StringTkn: &token.Token{
+													ID:    token.T_STRING,
+													Value: []byte("null"),
 													Position: &position.Position{
 														StartLine: 3,
 														EndLine:   3,
@@ -1331,143 +2392,279 @@ func TestPhp7ParameterNode(t *testing.T) {
 								},
 							},
 							&ast.Parameter{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  100,
+									EndPos:    112,
+								},
+								Type: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
 										StartPos:  100,
-										EndPos:    112,
-									},
-								},
-								Type: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  100,
-											EndPos:    103,
-										},
+										EndPos:    103,
 									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 3,
+												EndLine:   3,
+												StartPos:  100,
+												EndPos:    103,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("baz"),
 												Position: &position.Position{
 													StartLine: 3,
 													EndLine:   3,
 													StartPos:  100,
 													EndPos:    103,
 												},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 3,
+															EndLine:   3,
+															StartPos:  99,
+															EndPos:    100,
+														},
+													},
+												},
 											},
 											Value: []byte("baz"),
 										},
 									},
 								},
-								Var: &ast.Reference{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  104,
-											EndPos:    112,
-										},
+								AmpersandTkn: &token.Token{
+									ID:    token.ID(38),
+									Value: []byte("&"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  104,
+										EndPos:    105,
 									},
-									Var: &ast.Variadic{
-										Node: ast.Node{
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  105,
-												EndPos:    112,
-											},
-										},
-										Var: &ast.ExprVariable{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 3,
-													EndLine:   3,
-													StartPos:  108,
-													EndPos:    112,
-												},
-											},
-											VarName: &ast.Identifier{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 3,
-														EndLine:   3,
-														StartPos:  108,
-														EndPos:    112,
-													},
-												},
-												Value: []byte("$baz"),
+												StartPos:  103,
+												EndPos:    104,
 											},
 										},
 									},
 								},
+								VariadicTkn: &token.Token{
+									ID:    token.T_ELLIPSIS,
+									Value: []byte("..."),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  105,
+										EndPos:    108,
+									},
+								},
+								Var: &ast.ExprVariable{
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  108,
+										EndPos:    112,
+									},
+									VarName: &ast.Identifier{
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  108,
+											EndPos:    112,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$baz"),
+											Position: &position.Position{
+												StartLine: 3,
+												EndLine:   3,
+												StartPos:  108,
+												EndPos:    112,
+											},
+										},
+										Value: []byte("$baz"),
+									},
+								},
+							},
+						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  98,
+									EndPos:    99,
+								},
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  112,
+								EndPos:    113,
 							},
 						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  114,
+								EndPos:    116,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
 									StartPos:  114,
-									EndPos:    116,
+									EndPos:    115,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  113,
+											EndPos:    114,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  115,
+									EndPos:    116,
+								},
+							},
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  116,
+						EndPos:    117,
+					},
+				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 4,
+					EndLine:   4,
+					StartPos:  120,
+					EndPos:    162,
+				},
+				Expr: &ast.ExprClosure{
 					Position: &position.Position{
 						StartLine: 4,
 						EndLine:   4,
 						StartPos:  120,
-						EndPos:    162,
+						EndPos:    161,
 					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
+					FunctionTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 4,
 							EndLine:   4,
 							StartPos:  120,
-							EndPos:    161,
+							EndPos:    128,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   4,
+									StartPos:  117,
+									EndPos:    120,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  128,
+							EndPos:    129,
 						},
 					},
 					Params: []ast.Vertex{
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  129,
+								EndPos:    143,
+							},
+							Type: &ast.Nullable{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
 									StartPos:  129,
-									EndPos:    143,
+									EndPos:    133,
 								},
-							},
-							Type: &ast.Nullable{
-								Node: ast.Node{
+								QuestionTkn: &token.Token{
+									ID:    token.ID(63),
+									Value: []byte("?"),
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
 										StartPos:  129,
-										EndPos:    133,
+										EndPos:    130,
 									},
 								},
 								Expr: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  130,
-											EndPos:    133,
-										},
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  130,
+										EndPos:    133,
 									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 4,
+												EndLine:   4,
+												StartPos:  130,
+												EndPos:    133,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("bar"),
 												Position: &position.Position{
 													StartLine: 4,
 													EndLine:   4,
@@ -1481,47 +2678,79 @@ func TestPhp7ParameterNode(t *testing.T) {
 								},
 							},
 							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  134,
+									EndPos:    138,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
 										StartPos:  134,
 										EndPos:    138,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$bar"),
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
 											StartPos:  134,
 											EndPos:    138,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 4,
+													EndLine:   4,
+													StartPos:  133,
+													EndPos:    134,
+												},
+											},
+										},
 									},
 									Value: []byte("$bar"),
 								},
 							},
+							EqualTkn: &token.Token{
+								ID:    token.ID(61),
+								Value: []byte("="),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  138,
+									EndPos:    139,
+								},
+							},
 							DefaultValue: &ast.ExprConstFetch{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  139,
+									EndPos:    143,
+								},
+								Const: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
 										StartPos:  139,
 										EndPos:    143,
 									},
-								},
-								Const: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  139,
-											EndPos:    143,
-										},
-									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 4,
+												EndLine:   4,
+												StartPos:  139,
+												EndPos:    143,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("null"),
 												Position: &position.Position{
 													StartLine: 4,
 													EndLine:   4,
@@ -1536,133 +2765,292 @@ func TestPhp7ParameterNode(t *testing.T) {
 							},
 						},
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  145,
+								EndPos:    157,
+							},
+							Type: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
 									StartPos:  145,
-									EndPos:    157,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  145,
-										EndPos:    148,
-									},
+									EndPos:    148,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  145,
+											EndPos:    148,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("baz"),
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
 												StartPos:  145,
 												EndPos:    148,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 4,
+														EndLine:   4,
+														StartPos:  144,
+														EndPos:    145,
+													},
+												},
+											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.Reference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  149,
-										EndPos:    157,
-									},
+							AmpersandTkn: &token.Token{
+								ID:    token.ID(38),
+								Value: []byte("&"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  149,
+									EndPos:    150,
 								},
-								Var: &ast.Variadic{
-									Node: ast.Node{
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  150,
+											StartPos:  148,
+											EndPos:    149,
+										},
+									},
+								},
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  150,
+									EndPos:    153,
+								},
+							},
+							Var: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  153,
+									EndPos:    157,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  153,
+										EndPos:    157,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$baz"),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  153,
 											EndPos:    157,
 										},
 									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 4,
-												EndLine:   4,
-												StartPos:  153,
-												EndPos:    157,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 4,
-													EndLine:   4,
-													StartPos:  153,
-													EndPos:    157,
-												},
-											},
-											Value: []byte("$baz"),
-										},
-									},
+									Value: []byte("$baz"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  143,
+								EndPos:    144,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  157,
+							EndPos:    158,
+						},
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  159,
+							EndPos:    160,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  158,
+									EndPos:    159,
 								},
 							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  160,
+							EndPos:    161,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  161,
+						EndPos:    162,
+					},
 				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 5,
+					EndLine:   5,
+					StartPos:  165,
+					EndPos:    214,
+				},
+				Expr: &ast.ExprClosure{
 					Position: &position.Position{
 						StartLine: 5,
 						EndLine:   5,
 						StartPos:  165,
-						EndPos:    214,
+						EndPos:    213,
 					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
+					StaticTkn: &token.Token{
+						ID:    token.T_STATIC,
+						Value: []byte("static"),
 						Position: &position.Position{
 							StartLine: 5,
 							EndLine:   5,
 							StartPos:  165,
-							EndPos:    213,
+							EndPos:    171,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   5,
+									StartPos:  162,
+									EndPos:    165,
+								},
+							},
+						},
+					},
+					FunctionTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  172,
+							EndPos:    180,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  171,
+									EndPos:    172,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  180,
+							EndPos:    181,
 						},
 					},
-					Static: true,
 					Params: []ast.Vertex{
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  181,
+								EndPos:    195,
+							},
+							Type: &ast.Nullable{
 								Position: &position.Position{
 									StartLine: 5,
 									EndLine:   5,
 									StartPos:  181,
-									EndPos:    195,
+									EndPos:    185,
 								},
-							},
-							Type: &ast.Nullable{
-								Node: ast.Node{
+								QuestionTkn: &token.Token{
+									ID:    token.ID(63),
+									Value: []byte("?"),
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
 										StartPos:  181,
-										EndPos:    185,
+										EndPos:    182,
 									},
 								},
 								Expr: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 5,
-											EndLine:   5,
-											StartPos:  182,
-											EndPos:    185,
-										},
+									Position: &position.Position{
+										StartLine: 5,
+										EndLine:   5,
+										StartPos:  182,
+										EndPos:    185,
 									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 5,
+												EndLine:   5,
+												StartPos:  182,
+												EndPos:    185,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("bar"),
 												Position: &position.Position{
 													StartLine: 5,
 													EndLine:   5,
@@ -1676,47 +3064,79 @@ func TestPhp7ParameterNode(t *testing.T) {
 								},
 							},
 							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  186,
+									EndPos:    190,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
 										StartPos:  186,
 										EndPos:    190,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$bar"),
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
 											StartPos:  186,
 											EndPos:    190,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 5,
+													EndLine:   5,
+													StartPos:  185,
+													EndPos:    186,
+												},
+											},
+										},
 									},
 									Value: []byte("$bar"),
 								},
 							},
+							EqualTkn: &token.Token{
+								ID:    token.ID(61),
+								Value: []byte("="),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  190,
+									EndPos:    191,
+								},
+							},
 							DefaultValue: &ast.ExprConstFetch{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  191,
+									EndPos:    195,
+								},
+								Const: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
 										StartPos:  191,
 										EndPos:    195,
 									},
-								},
-								Const: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 5,
-											EndLine:   5,
-											StartPos:  191,
-											EndPos:    195,
-										},
-									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 5,
+												EndLine:   5,
+												StartPos:  191,
+												EndPos:    195,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("null"),
 												Position: &position.Position{
 													StartLine: 5,
 													EndLine:   5,
@@ -1731,81 +3151,193 @@ func TestPhp7ParameterNode(t *testing.T) {
 							},
 						},
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  197,
+								EndPos:    209,
+							},
+							Type: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 5,
 									EndLine:   5,
 									StartPos:  197,
-									EndPos:    209,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  197,
-										EndPos:    200,
-									},
+									EndPos:    200,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  197,
+											EndPos:    200,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("baz"),
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
 												StartPos:  197,
 												EndPos:    200,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 5,
+														EndLine:   5,
+														StartPos:  196,
+														EndPos:    197,
+													},
+												},
+											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.Reference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  201,
-										EndPos:    209,
-									},
+							AmpersandTkn: &token.Token{
+								ID:    token.ID(38),
+								Value: []byte("&"),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  201,
+									EndPos:    202,
 								},
-								Var: &ast.Variadic{
-									Node: ast.Node{
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  202,
+											StartPos:  200,
+											EndPos:    201,
+										},
+									},
+								},
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  202,
+									EndPos:    205,
+								},
+							},
+							Var: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  205,
+									EndPos:    209,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 5,
+										EndLine:   5,
+										StartPos:  205,
+										EndPos:    209,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$baz"),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  205,
 											EndPos:    209,
 										},
 									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 5,
-												EndLine:   5,
-												StartPos:  205,
-												EndPos:    209,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 5,
-													EndLine:   5,
-													StartPos:  205,
-													EndPos:    209,
-												},
-											},
-											Value: []byte("$baz"),
-										},
-									},
+									Value: []byte("$baz"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  195,
+								EndPos:    196,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  209,
+							EndPos:    210,
+						},
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  211,
+							EndPos:    212,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  210,
+									EndPos:    211,
 								},
 							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  212,
+							EndPos:    213,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  213,
+						EndPos:    214,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   6,
+						StartPos:  214,
+						EndPos:    216,
+					},
 				},
 			},
 		},
@@ -1815,8 +3347,6 @@ func TestPhp7ParameterNode(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -1824,23 +3354,53 @@ func TestCommentEndFile(t *testing.T) {
 	src := `<? //comment at the end)`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: -1,
-				EndLine:   -1,
-				StartPos:  -1,
-				EndPos:    -1,
-			},
+		Position: &position.Position{
+			StartLine: -1,
+			EndLine:   -1,
+			StartPos:  -1,
+			EndPos:    -1,
 		},
 		Stmts: []ast.Vertex{},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_OPEN_TAG,
+					Value: []byte("<?"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  0,
+						EndPos:    2,
+					},
+				},
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte(" "),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  2,
+						EndPos:    3,
+					},
+				},
+				{
+					ID:    token.T_COMMENT,
+					Value: []byte("//comment at the end)"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  3,
+						EndPos:    24,
+					},
+				},
+			},
+		},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -1850,77 +3410,118 @@ func TestName(t *testing.T) {
 	src := `<? foo();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    9,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    9,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    9,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    9,
+						EndPos:    8,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    8,
-						},
-					},
-					Function: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    6,
-							},
+							EndPos:    6,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  3,
+									EndPos:    6,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    6,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("foo"),
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  6,
-								EndPos:    8,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -1928,45 +3529,77 @@ func TestFullyQualified(t *testing.T) {
 	src := `<? \foo();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    10,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    10,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    10,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    10,
+						EndPos:    9,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.NameFullyQualified{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    9,
+							EndPos:    7,
 						},
-					},
-					Function: &ast.NameFullyQualified{
-						Node: ast.Node{
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    7,
+								EndPos:    4,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    7,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -1978,27 +3611,46 @@ func TestFullyQualified(t *testing.T) {
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  7,
-								EndPos:    9,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2006,45 +3658,87 @@ func TestRelative(t *testing.T) {
 	src := `<? namespace\foo();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    18,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.NameRelative{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    18,
+							EndPos:    16,
 						},
-					},
-					Function: &ast.NameRelative{
-						Node: ast.Node{
+						NsTkn: &token.Token{
+							ID:    token.T_NAMESPACE,
+							Value: []byte("namespace"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    16,
+								EndPos:    12,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    16,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -2056,27 +3750,46 @@ func TestRelative(t *testing.T) {
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  16,
-								EndPos:    18,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    17,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  17,
+							EndPos:    18,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2086,36 +3799,70 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) {
 	src := `<? "test $var";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				Expr: &ast.ScalarEncapsed{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    14,
 					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
+					OpenQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    14,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    9,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2126,16 +3873,22 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) {
 							Value: []byte("test "),
 						},
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    13,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    13,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$var"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -2147,17 +3900,36 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) {
 							},
 						},
 					},
+					CloseQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    14,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2165,36 +3937,70 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) {
 	src := `<? "test $a";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ScalarEncapsed{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
+					OpenQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    9,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2205,16 +4011,22 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) {
 							Value: []byte("test "),
 						},
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    11,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -2226,17 +4038,36 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) {
 							},
 						},
 					},
+					CloseQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2244,36 +4075,70 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) {
 	src := `<? "test $var\"";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				Expr: &ast.ScalarEncapsed{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    16,
 					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
+					OpenQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    16,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    9,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2284,16 +4149,22 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) {
 							Value: []byte("test "),
 						},
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    13,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    13,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$var"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -2305,7 +4176,15 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) {
 							},
 						},
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    15,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\\\""),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2316,17 +4195,36 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) {
 							Value: []byte("\\\""),
 						},
 					},
+					CloseQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    16,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2334,36 +4232,70 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) {
 	src := `<? "=$a{$b}";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ScalarEncapsed{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
+					OpenQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    5,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("="),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2374,16 +4306,22 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) {
 							Value: []byte("="),
 						},
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    7,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  5,
 									EndPos:    7,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -2394,39 +4332,92 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) {
 								Value: []byte("$a"),
 							},
 						},
-						&ast.ExprVariable{
-							Node: ast.Node{
+						&ast.ParserBrackets{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    11,
+							},
+							OpenBracketTkn: &token.Token{
+								ID:    token.T_CURLY_OPEN,
+								Value: []byte("{"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  7,
+									EndPos:    8,
+								},
+							},
+							Child: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
 									EndPos:    10,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
 										EndPos:    10,
 									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  8,
+											EndPos:    10,
+										},
+									},
+									Value: []byte("$b"),
+								},
+							},
+							CloseBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
 								},
-								Value: []byte("$b"),
 							},
 						},
 					},
+					CloseQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2434,36 +4425,70 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) {
 	src := `<? "test $foo->bar()";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    22,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    22,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    22,
+				},
+				Expr: &ast.ScalarEncapsed{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    22,
+						EndPos:    21,
 					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
+					OpenQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    21,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    9,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2474,25 +4499,29 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) {
 							Value: []byte("test "),
 						},
 						&ast.ExprPropertyFetch{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    18,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
-									EndPos:    18,
+									EndPos:    13,
 								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  9,
 										EndPos:    13,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -2503,8 +4532,26 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) {
 									Value: []byte("$foo"),
 								},
 							},
+							ObjectOperatorTkn: &token.Token{
+								ID:    token.T_OBJECT_OPERATOR,
+								Value: []byte("->"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    15,
+								},
+							},
 							Property: &ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  15,
+									EndPos:    18,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("bar"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -2516,7 +4563,15 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) {
 							},
 						},
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  18,
+								EndPos:    20,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("()"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2527,17 +4582,36 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) {
 							Value: []byte("()"),
 						},
 					},
+					CloseQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    21,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    22,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2545,36 +4619,70 @@ func TestScalarEncapsed_DollarOpenCurlyBraces(t *testing.T) {
 	src := `<? "test ${foo}";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				Expr: &ast.ScalarEncapsed{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    16,
 					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
+					OpenQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    16,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    9,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2584,105 +4692,40 @@ func TestScalarEncapsed_DollarOpenCurlyBraces(t *testing.T) {
 							},
 							Value: []byte("test "),
 						},
-						&ast.ExprVariable{
-							Node: ast.Node{
+						&ast.ParserBrackets{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    15,
+							},
+							OpenBracketTkn: &token.Token{
+								ID:    token.T_DOLLAR_OPEN_CURLY_BRACES,
+								Value: []byte("${"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
-									EndPos:    15,
+									EndPos:    11,
 								},
 							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  11,
-										EndPos:    14,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) {
-	src := `<? "test ${foo[0]}";`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    20,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    20,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    19,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Child: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  4,
-									EndPos:    9,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    18,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  11,
-										EndPos:    14,
-									},
+									StartPos:  11,
+									EndPos:    14,
 								},
 								VarName: &ast.Identifier{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  11,
+										EndPos:    14,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING_VARNAME,
+										Value: []byte("foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -2693,67 +4736,119 @@ func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) {
 									Value: []byte("foo"),
 								},
 							},
-							Dim: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  15,
-										EndPos:    16,
-									},
+							CloseBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    15,
 								},
-								Value: []byte("0"),
 							},
 						},
 					},
+					CloseQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    16,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
-func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) {
-	src := `<? "test {$foo->bar()}";`
+func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) {
+	src := `<? "test ${foo[0]}";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    24,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    20,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    20,
+				},
+				Expr: &ast.ScalarEncapsed{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    24,
+						EndPos:    19,
 					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
+					OpenQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    23,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    9,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -2763,70 +4858,362 @@ func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) {
 							},
 							Value: []byte("test "),
 						},
-						&ast.ExprMethodCall{
-							Node: ast.Node{
+						&ast.ParserBrackets{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    18,
+							},
+							OpenBracketTkn: &token.Token{
+								ID:    token.T_DOLLAR_OPEN_CURLY_BRACES,
+								Value: []byte("${"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  10,
-									EndPos:    21,
+									StartPos:  9,
+									EndPos:    11,
 								},
 							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
+							Child: &ast.ExprArrayDimFetch{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  11,
+									EndPos:    17,
+								},
+								Var: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
-										StartPos:  10,
+										StartPos:  11,
 										EndPos:    14,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
-											StartPos:  10,
+											StartPos:  11,
 											EndPos:    14,
 										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_STRING_VARNAME,
+											Value: []byte("foo"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  11,
+												EndPos:    14,
+											},
+										},
+										Value: []byte("foo"),
 									},
-									Value: []byte("$foo"),
 								},
-							},
-							Method: &ast.Identifier{
-								Node: ast.Node{
+								OpenBracketTkn: &token.Token{
+									ID:    token.ID(91),
+									Value: []byte("["),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    15,
+									},
+								},
+								Dim: &ast.ScalarLnumber{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  15,
+										EndPos:    16,
+									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("0"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  15,
+											EndPos:    16,
+										},
+									},
+									Value: []byte("0"),
+								},
+								CloseBracketTkn: &token.Token{
+									ID:    token.ID(93),
+									Value: []byte("]"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  16,
-										EndPos:    19,
+										EndPos:    17,
 									},
 								},
-								Value: []byte("bar"),
 							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    21,
-									},
+							CloseBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  17,
+									EndPos:    18,
 								},
 							},
 						},
 					},
+					CloseQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    19,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    20,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
+	}
+
+	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
+	php7parser := php7.NewParser(lexer, nil)
+	php7parser.Parse()
+	actual := php7parser.GetRootNode()
+	assert.DeepEqual(t, expected, actual)
+}
+
+func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) {
+	src := `<? "test {$foo->bar()}";`
+
+	expected := &ast.Root{
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    24,
+		},
+		Stmts: []ast.Vertex{
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    24,
+				},
+				Expr: &ast.ScalarEncapsed{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  3,
+						EndPos:    23,
+					},
+					OpenQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  3,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					Parts: []ast.Vertex{
+						&ast.ScalarEncapsedStringPart{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    9,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    9,
+								},
+							},
+							Value: []byte("test "),
+						},
+						&ast.ParserBrackets{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    22,
+							},
+							OpenBracketTkn: &token.Token{
+								ID:    token.T_CURLY_OPEN,
+								Value: []byte("{"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  9,
+									EndPos:    10,
+								},
+							},
+							Child: &ast.ExprMethodCall{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    21,
+								},
+								Var: &ast.ExprVariable{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  10,
+										EndPos:    14,
+									},
+									VarName: &ast.Identifier{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  10,
+											EndPos:    14,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$foo"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  10,
+												EndPos:    14,
+											},
+										},
+										Value: []byte("$foo"),
+									},
+								},
+								ObjectOperatorTkn: &token.Token{
+									ID:    token.T_OBJECT_OPERATOR,
+									Value: []byte("->"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    16,
+									},
+								},
+								Method: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    19,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("bar"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  16,
+											EndPos:    19,
+										},
+									},
+									Value: []byte("bar"),
+								},
+								OpenParenthesisTkn: &token.Token{
+									ID:    token.ID(40),
+									Value: []byte("("),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    20,
+									},
+								},
+								CloseParenthesisTkn: &token.Token{
+									ID:    token.ID(41),
+									Value: []byte(")"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  20,
+										EndPos:    21,
+									},
+								},
+							},
+							CloseBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  21,
+									EndPos:    22,
+								},
+							},
+						},
+					},
+					CloseQuoteTkn: &token.Token{
+						ID:    token.ID(34),
+						Value: []byte("\""),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  22,
+							EndPos:    23,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  23,
+						EndPos:    24,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2837,37 +5224,70 @@ LBL;
 `
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   3,
-				StartPos:  3,
-				EndPos:    24,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   3,
+			StartPos:  3,
+			EndPos:    24,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   3,
+					StartPos:  3,
+					EndPos:    24,
+				},
+				Expr: &ast.ScalarHeredoc{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   3,
 						StartPos:  3,
-						EndPos:    24,
+						EndPos:    23,
 					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<LBL\n"),
 						Position: &position.Position{
 							StartLine: 1,
-							EndLine:   3,
+							EndLine:   1,
 							StartPos:  3,
-							EndPos:    23,
+							EndPos:    10,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
-					Label: []byte("<<<LBL\n"),
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  10,
+								EndPos:    15,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
@@ -2878,16 +5298,22 @@ LBL;
 							Value: []byte("test "),
 						},
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  15,
+								EndPos:    19,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
 									StartPos:  15,
 									EndPos:    19,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$var"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
@@ -2899,7 +5325,15 @@ LBL;
 							},
 						},
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  19,
+								EndPos:    20,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\n"),
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
@@ -2910,6 +5344,40 @@ LBL;
 							Value: []byte("\n"),
 						},
 					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("LBL"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  20,
+							EndPos:    23,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  23,
+						EndPos:    24,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  24,
+						EndPos:    25,
+					},
 				},
 			},
 		},
@@ -2919,8 +5387,6 @@ LBL;
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2931,37 +5397,70 @@ LBL;
 `
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   3,
-				StartPos:  3,
-				EndPos:    26,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   3,
+			StartPos:  3,
+			EndPos:    26,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   3,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				Expr: &ast.ScalarHeredoc{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   3,
 						StartPos:  3,
-						EndPos:    26,
+						EndPos:    25,
 					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<\"LBL\"\n"),
 						Position: &position.Position{
 							StartLine: 1,
-							EndLine:   3,
+							EndLine:   1,
 							StartPos:  3,
-							EndPos:    25,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
-					Label: []byte("<<<\"LBL\"\n"),
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    17,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test "),
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
@@ -2972,16 +5471,22 @@ LBL;
 							Value: []byte("test "),
 						},
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  17,
+								EndPos:    21,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
 									StartPos:  17,
 									EndPos:    21,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$var"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
@@ -2993,7 +5498,15 @@ LBL;
 							},
 						},
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  21,
+								EndPos:    22,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\n"),
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
@@ -3004,6 +5517,40 @@ LBL;
 							Value: []byte("\n"),
 						},
 					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("LBL"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  22,
+							EndPos:    25,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  25,
+						EndPos:    26,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  26,
+						EndPos:    27,
+					},
 				},
 			},
 		},
@@ -3013,8 +5560,6 @@ LBL;
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3025,37 +5570,70 @@ LBL;
 `
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   3,
-				StartPos:  3,
-				EndPos:    26,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   3,
+			StartPos:  3,
+			EndPos:    26,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   3,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				Expr: &ast.ScalarHeredoc{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   3,
 						StartPos:  3,
-						EndPos:    26,
+						EndPos:    25,
 					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<'LBL'\n"),
 						Position: &position.Position{
 							StartLine: 1,
-							EndLine:   3,
+							EndLine:   1,
 							StartPos:  3,
-							EndPos:    25,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
-					Label: []byte("<<<'LBL'\n"),
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    22,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("test $var\n"),
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
@@ -3066,6 +5644,40 @@ LBL;
 							Value: []byte("test $var\n"),
 						},
 					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("LBL"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  22,
+							EndPos:    25,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  25,
+						EndPos:    26,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  26,
+						EndPos:    27,
+					},
 				},
 			},
 		},
@@ -3075,8 +5687,6 @@ LBL;
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3086,34 +5696,93 @@ CAD;
 `
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   2,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   2,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   2,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				Expr: &ast.ScalarHeredoc{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   2,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    13,
 					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<CAD\n"),
 						Position: &position.Position{
 							StartLine: 1,
-							EndLine:   2,
+							EndLine:   1,
 							StartPos:  3,
+							EndPos:    10,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("AD"),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  11,
 							EndPos:    13,
 						},
 					},
-					Label: []byte("<<<CAD\n"),
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  14,
+						EndPos:    15,
+					},
 				},
 			},
 		},
@@ -3123,8 +5792,6 @@ CAD;
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3135,37 +5802,70 @@ CAD;
 `
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   3,
-				StartPos:  3,
-				EndPos:    21,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   3,
+			StartPos:  3,
+			EndPos:    21,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   3,
+					StartPos:  3,
+					EndPos:    21,
+				},
+				Expr: &ast.ScalarHeredoc{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   3,
 						StartPos:  3,
-						EndPos:    21,
+						EndPos:    20,
 					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<CAD\n"),
 						Position: &position.Position{
 							StartLine: 1,
-							EndLine:   3,
+							EndLine:   1,
 							StartPos:  3,
-							EndPos:    20,
+							EndPos:    10,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
-					Label: []byte("<<<CAD\n"),
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  10,
+								EndPos:    17,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\thello\n"),
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
@@ -3176,6 +5876,40 @@ CAD;
 							Value: []byte("\thello\n"),
 						},
 					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("CAD"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  17,
+							EndPos:    20,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  21,
+						EndPos:    22,
+					},
 				},
 			},
 		},
@@ -3185,8 +5919,6 @@ CAD;
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3195,45 +5927,80 @@ func TestScalarMagicConstant(t *testing.T) {
 	src := `<? __DIR__;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    11,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    11,
+				},
+				Expr: &ast.ScalarMagicConstant{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    11,
+						EndPos:    10,
 					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
+					MagicConstTkn: &token.Token{
+						ID:    token.T_DIR,
+						Value: []byte("__DIR__"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    10,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("__DIR__"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3241,45 +6008,80 @@ func TestScalarNumber_LNumber(t *testing.T) {
 	src := `<? 1234567890123456789;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				Expr: &ast.ScalarLnumber{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    22,
 					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1234567890123456789"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    22,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("1234567890123456789"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3287,45 +6089,80 @@ func TestScalarNumber_DNumber(t *testing.T) {
 	src := `<? 12345678901234567890;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    24,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    24,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    24,
+				},
+				Expr: &ast.ScalarDnumber{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    24,
+						EndPos:    23,
 					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
+					NumberTkn: &token.Token{
+						ID:    token.T_DNUMBER,
+						Value: []byte("12345678901234567890"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    23,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("12345678901234567890"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  23,
+						EndPos:    24,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3333,45 +6170,80 @@ func TestScalarNumber_Float(t *testing.T) {
 	src := `<? 0.;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    6,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    6,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    6,
+				},
+				Expr: &ast.ScalarDnumber{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    6,
+						EndPos:    5,
 					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
+					NumberTkn: &token.Token{
+						ID:    token.T_DNUMBER,
+						Value: []byte("0."),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    5,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("0."),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  5,
+						EndPos:    6,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3379,45 +6251,80 @@ func TestScalarNumber_BinaryLNumber(t *testing.T) {
 	src := `<? 0b0111111111111111111111111111111111111111111111111111111111111111;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    70,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    70,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    70,
+				},
+				Expr: &ast.ScalarLnumber{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    70,
+						EndPos:    69,
 					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("0b0111111111111111111111111111111111111111111111111111111111111111"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    69,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("0b0111111111111111111111111111111111111111111111111111111111111111"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  69,
+						EndPos:    70,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3425,45 +6332,80 @@ func TestScalarNumber_BinaryDNumber(t *testing.T) {
 	src := `<? 0b1111111111111111111111111111111111111111111111111111111111111111;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    70,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    70,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    70,
+				},
+				Expr: &ast.ScalarDnumber{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    70,
+						EndPos:    69,
 					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
+					NumberTkn: &token.Token{
+						ID:    token.T_DNUMBER,
+						Value: []byte("0b1111111111111111111111111111111111111111111111111111111111111111"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    69,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("0b1111111111111111111111111111111111111111111111111111111111111111"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  69,
+						EndPos:    70,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3471,45 +6413,80 @@ func TestScalarNumber_HLNumber(t *testing.T) {
 	src := `<? 0x007111111111111111;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    24,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    24,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    24,
+				},
+				Expr: &ast.ScalarLnumber{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    24,
+						EndPos:    23,
 					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("0x007111111111111111"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    23,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("0x007111111111111111"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  23,
+						EndPos:    24,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3517,45 +6494,80 @@ func TestScalarNumber_HDNumber(t *testing.T) {
 	src := `<? 0x8111111111111111;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    22,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    22,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    22,
+				},
+				Expr: &ast.ScalarDnumber{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    22,
+						EndPos:    21,
 					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
+					NumberTkn: &token.Token{
+						ID:    token.T_DNUMBER,
+						Value: []byte("0x8111111111111111"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    21,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("0x8111111111111111"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    22,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3563,45 +6575,80 @@ func TestScalarString_DoubleQuotedScalarString(t *testing.T) {
 	src := `<? "test";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    10,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    10,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    10,
+				},
+				Expr: &ast.ScalarString{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    10,
+						EndPos:    9,
 					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("\"test\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    9,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("\"test\""),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3609,45 +6656,80 @@ func TestScalarString_DoubleQuotedScalarStringWithEscapedVar(t *testing.T) {
 	src := `<? "\$test";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ScalarString{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("\"\\$test\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    11,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("\"\\$test\""),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3657,45 +6739,80 @@ func TestScalarString_MultilineDoubleQuotedScalarString(t *testing.T) {
 	";`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   3,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   3,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   3,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				Expr: &ast.ScalarString{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   3,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    13,
 					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("\"\n\ttest\n\t\""),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   3,
 							StartPos:  3,
 							EndPos:    13,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("\"\n\ttest\n\t\""),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  13,
+						EndPos:    14,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3703,45 +6820,80 @@ func TestScalarString_SingleQuotedScalarString(t *testing.T) {
 	src := `<? '$test';`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    11,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    11,
+				},
+				Expr: &ast.ScalarString{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    11,
+						EndPos:    10,
 					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("'$test'"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    10,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("'$test'"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3751,45 +6903,80 @@ func TestScalarString_MultilineSingleQuotedScalarString(t *testing.T) {
 	';`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   3,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   3,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   3,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				Expr: &ast.ScalarString{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   3,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    14,
 					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("'\n\t$test\n\t'"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   3,
 							StartPos:  3,
 							EndPos:    14,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("'\n\t$test\n\t'"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3802,36 +6989,91 @@ func TestStmtAltIf_AltIf(t *testing.T) {
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   3,
-				StartPos:  5,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   3,
+			StartPos:  5,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   3,
+					StartPos:  5,
+					EndPos:    23,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 2,
-						EndLine:   3,
+						EndLine:   2,
 						StartPos:  5,
-						EndPos:    23,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  8,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  7,
+								EndPos:    8,
+							},
+						},
 					},
 				},
-				Alt: true,
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    11,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
 							StartPos:  9,
 							EndPos:    11,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
@@ -3842,17 +7084,93 @@ func TestStmtAltIf_AltIf(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    13,
+							},
 						},
 					},
+				},
+				Stmt: &ast.StmtStmtList{
+					Position: &position.Position{
+						StartLine: -1,
+						EndLine:   -1,
+						StartPos:  -1,
+						EndPos:    -1,
+					},
 					Stmts: []ast.Vertex{},
 				},
+				EndIfTkn: &token.Token{
+					ID:    token.T_ENDIF,
+					Value: []byte("endif"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  17,
+						EndPos:    22,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   3,
+								StartPos:  14,
+								EndPos:    17,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   4,
+						StartPos:  23,
+						EndPos:    25,
+					},
+				},
 			},
 		},
 	}
@@ -3861,8 +7179,6 @@ func TestStmtAltIf_AltIf(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3874,36 +7190,91 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   4,
-				StartPos:  5,
-				EndPos:    38,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   4,
+			StartPos:  5,
+			EndPos:    38,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   4,
+					StartPos:  5,
+					EndPos:    38,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 2,
-						EndLine:   4,
+						EndLine:   2,
 						StartPos:  5,
-						EndPos:    38,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  8,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  7,
+								EndPos:    8,
+							},
+						},
 					},
 				},
-				Alt: true,
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    11,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
 							StartPos:  9,
 							EndPos:    11,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
@@ -3914,39 +7285,116 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    13,
+							},
 						},
 					},
+				},
+				Stmt: &ast.StmtStmtList{
+					Position: &position.Position{
+						StartLine: -1,
+						EndLine:   -1,
+						StartPos:  -1,
+						EndPos:    -1,
+					},
 					Stmts: []ast.Vertex{},
 				},
 				ElseIf: []ast.Vertex{
 					&ast.StmtElseIf{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   -1,
+							StartPos:  17,
+							EndPos:    -1,
+						},
+						ElseIfTkn: &token.Token{
+							ID:    token.T_ELSEIF,
+							Value: []byte("elseif"),
 							Position: &position.Position{
 								StartLine: 3,
-								EndLine:   -1,
+								EndLine:   3,
 								StartPos:  17,
-								EndPos:    -1,
+								EndPos:    23,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t"),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   3,
+										StartPos:  14,
+										EndPos:    17,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  24,
+								EndPos:    25,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  23,
+										EndPos:    24,
+									},
+								},
 							},
 						},
-						Alt: true,
 						Cond: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  25,
+								EndPos:    27,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
 									StartPos:  25,
 									EndPos:    27,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
@@ -3957,19 +7405,83 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
 								Value: []byte("$b"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  27,
+								EndPos:    28,
+							},
+						},
+						ColonTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  28,
+								EndPos:    29,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: -1,
-									EndLine:   -1,
-									StartPos:  -1,
-									EndPos:    -1,
-								},
+							Position: &position.Position{
+								StartLine: -1,
+								EndLine:   -1,
+								StartPos:  -1,
+								EndPos:    -1,
 							},
 							Stmts: []ast.Vertex{},
 						},
 					},
 				},
+				EndIfTkn: &token.Token{
+					ID:    token.T_ENDIF,
+					Value: []byte("endif"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  32,
+						EndPos:    37,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   4,
+								StartPos:  29,
+								EndPos:    32,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  37,
+						EndPos:    38,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   5,
+						StartPos:  38,
+						EndPos:    40,
+					},
+				},
 			},
 		},
 	}
@@ -3978,8 +7490,6 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3991,36 +7501,91 @@ func TestStmtAltIf_AltElse(t *testing.T) {
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   4,
-				StartPos:  5,
-				EndPos:    31,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   4,
+			StartPos:  5,
+			EndPos:    31,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   4,
+					StartPos:  5,
+					EndPos:    31,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 2,
-						EndLine:   4,
+						EndLine:   2,
 						StartPos:  5,
-						EndPos:    31,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  8,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  7,
+								EndPos:    8,
+							},
+						},
 					},
 				},
-				Alt: true,
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    11,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
 							StartPos:  9,
 							EndPos:    11,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
@@ -4031,37 +7596,140 @@ func TestStmtAltIf_AltElse(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: -1,
+						EndLine:   -1,
+						StartPos:  -1,
+						EndPos:    -1,
+					},
+					Stmts: []ast.Vertex{},
+				},
+				Else: &ast.StmtElse{
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   -1,
+						StartPos:  17,
+						EndPos:    -1,
+					},
+					ElseTkn: &token.Token{
+						ID:    token.T_ELSE,
+						Value: []byte("else"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  17,
+							EndPos:    21,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   3,
+									StartPos:  14,
+									EndPos:    17,
+								},
+							},
+						},
+					},
+					ColonTkn: &token.Token{
+						ID:    token.ID(58),
+						Value: []byte(":"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  21,
+							EndPos:    22,
+						},
+					},
+					Stmt: &ast.StmtStmtList{
 						Position: &position.Position{
 							StartLine: -1,
 							EndLine:   -1,
 							StartPos:  -1,
 							EndPos:    -1,
 						},
+						Stmts: []ast.Vertex{},
 					},
-					Stmts: []ast.Vertex{},
 				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 3,
-							EndLine:   -1,
-							StartPos:  17,
-							EndPos:    -1,
-						},
+				EndIfTkn: &token.Token{
+					ID:    token.T_ENDIF,
+					Value: []byte("endif"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  25,
+						EndPos:    30,
 					},
-					Alt: true,
-					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
 							Position: &position.Position{
-								StartLine: -1,
-								EndLine:   -1,
-								StartPos:  -1,
-								EndPos:    -1,
+								StartLine: 3,
+								EndLine:   4,
+								StartPos:  22,
+								EndPos:    25,
 							},
 						},
-						Stmts: []ast.Vertex{},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  30,
+						EndPos:    31,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   5,
+						StartPos:  31,
+						EndPos:    33,
 					},
 				},
 			},
@@ -4072,8 +7740,6 @@ func TestStmtAltIf_AltElse(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4087,36 +7753,91 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   6,
-				StartPos:  5,
-				EndPos:    61,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   6,
+			StartPos:  5,
+			EndPos:    61,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   6,
+					StartPos:  5,
+					EndPos:    61,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 2,
-						EndLine:   6,
+						EndLine:   2,
 						StartPos:  5,
-						EndPos:    61,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  8,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  7,
+								EndPos:    8,
+							},
+						},
 					},
 				},
-				Alt: true,
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    11,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
 							StartPos:  9,
 							EndPos:    11,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
@@ -4127,39 +7848,116 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    13,
+							},
 						},
 					},
+				},
+				Stmt: &ast.StmtStmtList{
+					Position: &position.Position{
+						StartLine: -1,
+						EndLine:   -1,
+						StartPos:  -1,
+						EndPos:    -1,
+					},
 					Stmts: []ast.Vertex{},
 				},
 				ElseIf: []ast.Vertex{
 					&ast.StmtElseIf{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   -1,
+							StartPos:  17,
+							EndPos:    -1,
+						},
+						ElseIfTkn: &token.Token{
+							ID:    token.T_ELSEIF,
+							Value: []byte("elseif"),
 							Position: &position.Position{
 								StartLine: 3,
-								EndLine:   -1,
+								EndLine:   3,
 								StartPos:  17,
-								EndPos:    -1,
+								EndPos:    23,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t"),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   3,
+										StartPos:  14,
+										EndPos:    17,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  24,
+								EndPos:    25,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  23,
+										EndPos:    24,
+									},
+								},
 							},
 						},
-						Alt: true,
 						Cond: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  25,
+								EndPos:    27,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
 									StartPos:  25,
 									EndPos:    27,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
@@ -4170,39 +7968,104 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
 								Value: []byte("$b"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  27,
+								EndPos:    28,
+							},
+						},
+						ColonTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  28,
+								EndPos:    29,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: -1,
-									EndLine:   -1,
-									StartPos:  -1,
-									EndPos:    -1,
-								},
+							Position: &position.Position{
+								StartLine: -1,
+								EndLine:   -1,
+								StartPos:  -1,
+								EndPos:    -1,
 							},
 							Stmts: []ast.Vertex{},
 						},
 					},
 					&ast.StmtElseIf{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   -1,
+							StartPos:  32,
+							EndPos:    -1,
+						},
+						ElseIfTkn: &token.Token{
+							ID:    token.T_ELSEIF,
+							Value: []byte("elseif"),
 							Position: &position.Position{
 								StartLine: 4,
-								EndLine:   -1,
+								EndLine:   4,
 								StartPos:  32,
-								EndPos:    -1,
+								EndPos:    38,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   4,
+										StartPos:  29,
+										EndPos:    32,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  39,
+								EndPos:    40,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  38,
+										EndPos:    39,
+									},
+								},
 							},
 						},
-						Alt: true,
 						Cond: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  40,
+								EndPos:    42,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
 									StartPos:  40,
 									EndPos:    42,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$c"),
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
@@ -4213,41 +8076,132 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
 								Value: []byte("$c"),
 							},
 						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: -1,
-									EndLine:   -1,
-									StartPos:  -1,
-									EndPos:    -1,
-								},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  42,
+								EndPos:    43,
 							},
-							Stmts: []ast.Vertex{},
 						},
-					},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 5,
-							EndLine:   -1,
-							StartPos:  47,
-							EndPos:    -1,
+						ColonTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  43,
+								EndPos:    44,
+							},
 						},
-					},
-					Alt: true,
-					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
+						Stmt: &ast.StmtStmtList{
 							Position: &position.Position{
 								StartLine: -1,
 								EndLine:   -1,
 								StartPos:  -1,
 								EndPos:    -1,
 							},
+							Stmts: []ast.Vertex{},
+						},
+					},
+				},
+				Else: &ast.StmtElse{
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   -1,
+						StartPos:  47,
+						EndPos:    -1,
+					},
+					ElseTkn: &token.Token{
+						ID:    token.T_ELSE,
+						Value: []byte("else"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  47,
+							EndPos:    51,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   5,
+									StartPos:  44,
+									EndPos:    47,
+								},
+							},
+						},
+					},
+					ColonTkn: &token.Token{
+						ID:    token.ID(58),
+						Value: []byte(":"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  51,
+							EndPos:    52,
+						},
+					},
+					Stmt: &ast.StmtStmtList{
+						Position: &position.Position{
+							StartLine: -1,
+							EndLine:   -1,
+							StartPos:  -1,
+							EndPos:    -1,
 						},
 						Stmts: []ast.Vertex{},
 					},
 				},
+				EndIfTkn: &token.Token{
+					ID:    token.T_ENDIF,
+					Value: []byte("endif"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  55,
+						EndPos:    60,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   6,
+								StartPos:  52,
+								EndPos:    55,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  60,
+						EndPos:    61,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   7,
+						StartPos:  61,
+						EndPos:    63,
+					},
+				},
 			},
 		},
 	}
@@ -4256,8 +8210,6 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4265,136 +8217,397 @@ func TestStmtClassConstList(t *testing.T) {
 	src := `<? class foo{ public const FOO = 1, BAR = 2; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    46,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    46,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    46,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    46,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtClassConstList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  14,
-								EndPos:    44,
-							},
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    44,
 						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    20,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PUBLIC,
+									Value: []byte("public"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  14,
 										EndPos:    20,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  13,
+												EndPos:    14,
+											},
+										},
+									},
 								},
 								Value: []byte("public"),
 							},
 						},
+						ConstTkn: &token.Token{
+							ID:    token.T_CONST,
+							Value: []byte("const"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  21,
+								EndPos:    26,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  20,
+										EndPos:    21,
+									},
+								},
+							},
+						},
 						Consts: []ast.Vertex{
 							&ast.StmtConstant{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    34,
+								},
+								Name: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  27,
-										EndPos:    34,
+										EndPos:    30,
 									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("FOO"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  27,
 											EndPos:    30,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  26,
+													EndPos:    27,
+												},
+											},
+										},
 									},
 									Value: []byte("FOO"),
 								},
+								EqualTkn: &token.Token{
+									ID:    token.ID(61),
+									Value: []byte("="),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  31,
+										EndPos:    32,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  30,
+												EndPos:    31,
+											},
+										},
+									},
+								},
 								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  33,
+										EndPos:    34,
+									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("1"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  33,
 											EndPos:    34,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  32,
+													EndPos:    33,
+												},
+											},
+										},
 									},
 									Value: []byte("1"),
 								},
 							},
 							&ast.StmtConstant{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  36,
+									EndPos:    43,
+								},
+								Name: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  36,
-										EndPos:    43,
+										EndPos:    39,
 									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("BAR"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  36,
 											EndPos:    39,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  35,
+													EndPos:    36,
+												},
+											},
+										},
 									},
 									Value: []byte("BAR"),
 								},
+								EqualTkn: &token.Token{
+									ID:    token.ID(61),
+									Value: []byte("="),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  40,
+										EndPos:    41,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  39,
+												EndPos:    40,
+											},
+										},
+									},
+								},
 								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  42,
+										EndPos:    43,
+									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("2"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  42,
 											EndPos:    43,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  41,
+													EndPos:    42,
+												},
+											},
+										},
 									},
 									Value: []byte("2"),
 								},
 							},
 						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  34,
+									EndPos:    35,
+								},
+							},
+						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  43,
+								EndPos:    44,
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  45,
+						EndPos:    46,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  44,
+								EndPos:    45,
+							},
+						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4402,123 +8615,364 @@ func TestStmtClassConstList_WithoutModifiers(t *testing.T) {
 	src := `<? class foo{ const FOO = 1, BAR = 2; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    39,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    39,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    39,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    39,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtClassConstList{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    37,
+						},
+						ConstTkn: &token.Token{
+							ID:    token.T_CONST,
+							Value: []byte("const"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
-								EndPos:    37,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    14,
+									},
+								},
 							},
 						},
 						Consts: []ast.Vertex{
 							&ast.StmtConstant{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  20,
+									EndPos:    27,
+								},
+								Name: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  20,
-										EndPos:    27,
+										EndPos:    23,
 									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("FOO"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  20,
 											EndPos:    23,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  19,
+													EndPos:    20,
+												},
+											},
+										},
 									},
 									Value: []byte("FOO"),
 								},
+								EqualTkn: &token.Token{
+									ID:    token.ID(61),
+									Value: []byte("="),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  24,
+										EndPos:    25,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  23,
+												EndPos:    24,
+											},
+										},
+									},
+								},
 								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  26,
+										EndPos:    27,
+									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("1"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  26,
 											EndPos:    27,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  25,
+													EndPos:    26,
+												},
+											},
+										},
 									},
 									Value: []byte("1"),
 								},
 							},
 							&ast.StmtConstant{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  29,
+									EndPos:    36,
+								},
+								Name: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  29,
-										EndPos:    36,
+										EndPos:    32,
 									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("BAR"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  29,
 											EndPos:    32,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  28,
+													EndPos:    29,
+												},
+											},
+										},
 									},
 									Value: []byte("BAR"),
 								},
+								EqualTkn: &token.Token{
+									ID:    token.ID(61),
+									Value: []byte("="),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  33,
+										EndPos:    34,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  32,
+												EndPos:    33,
+											},
+										},
+									},
+								},
 								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  35,
+										EndPos:    36,
+									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("2"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  35,
 											EndPos:    36,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  34,
+													EndPos:    35,
+												},
+											},
+										},
 									},
 									Value: []byte("2"),
 								},
 							},
 						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    28,
+								},
+							},
+						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  36,
+								EndPos:    37,
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  38,
+						EndPos:    39,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  37,
+								EndPos:    38,
+							},
+						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4526,80 +8980,248 @@ func TestStmtClassMethod_SimpleClassMethod(t *testing.T) {
 	src := `<? class foo{ function bar() {} }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    33,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    33,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    33,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    33,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtClassMethod{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    31,
+						},
+						FunctionTkn: &token.Token{
+							ID:    token.T_FUNCTION,
+							Value: []byte("function"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
-								EndPos:    31,
+								EndPos:    22,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    14,
+									},
+								},
 							},
 						},
-						ReturnsRef: false,
 						MethodName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  23,
+								EndPos:    26,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  23,
 									EndPos:    26,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  22,
+											EndPos:    23,
+										},
+									},
+								},
 							},
 							Value: []byte("bar"),
 						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  26,
+								EndPos:    27,
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  27,
+								EndPos:    28,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  29,
+								EndPos:    31,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  29,
-									EndPos:    31,
+									EndPos:    30,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  28,
+											EndPos:    29,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  30,
+									EndPos:    31,
+								},
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  32,
+						EndPos:    33,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  31,
+								EndPos:    32,
+							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4607,150 +9229,467 @@ func TestStmtClassMethod_PrivateProtectedClassMethod(t *testing.T) {
 	src := `<? class foo{ final private function bar() {} protected function baz() {} }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    75,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    75,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    75,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    75,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  14,
-								EndPos:    45,
-							},
-						},
-						ReturnsRef: false,
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  37,
-									EndPos:    40,
+									StartPos:  8,
+									EndPos:    9,
 								},
 							},
-							Value: []byte("bar"),
+						},
+					},
+					Value: []byte("foo"),
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtClassMethod{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    45,
 						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    19,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_FINAL,
+									Value: []byte("final"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  14,
 										EndPos:    19,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  13,
+												EndPos:    14,
+											},
+										},
+									},
 								},
 								Value: []byte("final"),
 							},
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  20,
+									EndPos:    27,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PRIVATE,
+									Value: []byte("private"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  20,
 										EndPos:    27,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  19,
+												EndPos:    20,
+											},
+										},
+									},
 								},
 								Value: []byte("private"),
 							},
 						},
+						FunctionTkn: &token.Token{
+							ID:    token.T_FUNCTION,
+							Value: []byte("function"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    36,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  27,
+										EndPos:    28,
+									},
+								},
+							},
+						},
+						MethodName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  37,
+								EndPos:    40,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("bar"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  37,
+									EndPos:    40,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  36,
+											EndPos:    37,
+										},
+									},
+								},
+							},
+							Value: []byte("bar"),
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  40,
+								EndPos:    41,
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  41,
+								EndPos:    42,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  43,
+								EndPos:    45,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  43,
-									EndPos:    45,
+									EndPos:    44,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  42,
+											EndPos:    43,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
-						},
-					},
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  46,
-								EndPos:    73,
-							},
-						},
-						ReturnsRef: false,
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  65,
-									EndPos:    68,
+									StartPos:  44,
+									EndPos:    45,
 								},
 							},
-							Value: []byte("baz"),
+						},
+					},
+					&ast.StmtClassMethod{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  46,
+							EndPos:    73,
 						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  46,
+									EndPos:    55,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PROTECTED,
+									Value: []byte("protected"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  46,
 										EndPos:    55,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  45,
+												EndPos:    46,
+											},
+										},
+									},
 								},
 								Value: []byte("protected"),
 							},
 						},
+						FunctionTkn: &token.Token{
+							ID:    token.T_FUNCTION,
+							Value: []byte("function"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  56,
+								EndPos:    64,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  55,
+										EndPos:    56,
+									},
+								},
+							},
+						},
+						MethodName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  65,
+								EndPos:    68,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("baz"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  65,
+									EndPos:    68,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  64,
+											EndPos:    65,
+										},
+									},
+								},
+							},
+							Value: []byte("baz"),
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  68,
+								EndPos:    69,
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  69,
+								EndPos:    70,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  71,
+								EndPos:    73,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  71,
-									EndPos:    73,
+									EndPos:    72,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  70,
+											EndPos:    71,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  72,
+									EndPos:    73,
+								},
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  74,
+						EndPos:    75,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  73,
+								EndPos:    74,
+							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4758,48 +9697,219 @@ func TestStmtClassMethod_Php7ClassMethod(t *testing.T) {
 	src := `<? class foo{ public static function &bar(): void {} }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    54,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    54,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    54,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    54,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtClassMethod{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    52,
+						},
+						Modifiers: []ast.Vertex{
+							&ast.Identifier{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    20,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PUBLIC,
+									Value: []byte("public"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    20,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  13,
+												EndPos:    14,
+											},
+										},
+									},
+								},
+								Value: []byte("public"),
+							},
+							&ast.Identifier{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  21,
+									EndPos:    27,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_STATIC,
+									Value: []byte("static"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  21,
+										EndPos:    27,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  20,
+												EndPos:    21,
+											},
+										},
+									},
+								},
+								Value: []byte("static"),
+							},
+						},
+						FunctionTkn: &token.Token{
+							ID:    token.T_FUNCTION,
+							Value: []byte("function"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  14,
-								EndPos:    52,
+								StartPos:  28,
+								EndPos:    36,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  27,
+										EndPos:    28,
+									},
+								},
+							},
+						},
+						AmpersandTkn: &token.Token{
+							ID:    token.ID(38),
+							Value: []byte("&"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  37,
+								EndPos:    38,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  36,
+										EndPos:    37,
+									},
+								},
 							},
 						},
-						ReturnsRef: true,
 						MethodName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  38,
+								EndPos:    41,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -4809,76 +9919,151 @@ func TestStmtClassMethod_Php7ClassMethod(t *testing.T) {
 							},
 							Value: []byte("bar"),
 						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  14,
-										EndPos:    20,
-									},
-								},
-								Value: []byte("public"),
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  41,
+								EndPos:    42,
 							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  21,
-										EndPos:    27,
-									},
-								},
-								Value: []byte("static"),
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  42,
+								EndPos:    43,
+							},
+						},
+						ColonTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  43,
+								EndPos:    44,
 							},
 						},
 						ReturnType: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  45,
-									EndPos:    49,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  45,
+								EndPos:    49,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  45,
+										EndPos:    49,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("void"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  45,
 											EndPos:    49,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  44,
+													EndPos:    45,
+												},
+											},
+										},
 									},
 									Value: []byte("void"),
 								},
 							},
 						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  50,
+								EndPos:    52,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  50,
-									EndPos:    52,
+									EndPos:    51,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  49,
+											EndPos:    50,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  51,
+									EndPos:    52,
+								},
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  53,
+						EndPos:    54,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  52,
+								EndPos:    53,
+							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4886,96 +10071,281 @@ func TestStmtClassMethod_AbstractClassMethod(t *testing.T) {
 	src := `<? abstract class Foo{ abstract public function bar(); }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    56,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    56,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    56,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  18,
-							EndPos:    21,
-						},
-					},
-					Value: []byte("Foo"),
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    56,
 				},
 				Modifiers: []ast.Vertex{
 					&ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  3,
+							EndPos:    11,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_ABSTRACT,
+							Value: []byte("abstract"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    11,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("abstract"),
 					},
 				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  23,
-								EndPos:    54,
+								StartPos:  11,
+								EndPos:    12,
 							},
 						},
-						ReturnsRef: false,
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
+					},
+				},
+				ClassName: &ast.Identifier{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    21,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    21,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  48,
-									EndPos:    51,
+									StartPos:  17,
+									EndPos:    18,
 								},
 							},
-							Value: []byte("bar"),
+						},
+					},
+					Value: []byte("Foo"),
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    22,
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtClassMethod{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    54,
 						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    31,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_ABSTRACT,
+									Value: []byte("abstract"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  23,
 										EndPos:    31,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  22,
+												EndPos:    23,
+											},
+										},
+									},
 								},
 								Value: []byte("abstract"),
 							},
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  32,
+									EndPos:    38,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PUBLIC,
+									Value: []byte("public"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  32,
 										EndPos:    38,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  31,
+												EndPos:    32,
+											},
+										},
+									},
 								},
 								Value: []byte("public"),
 							},
 						},
+						FunctionTkn: &token.Token{
+							ID:    token.T_FUNCTION,
+							Value: []byte("function"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  39,
+								EndPos:    47,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  38,
+										EndPos:    39,
+									},
+								},
+							},
+						},
+						MethodName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  48,
+								EndPos:    51,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("bar"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  48,
+									EndPos:    51,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  47,
+											EndPos:    48,
+										},
+									},
+								},
+							},
+							Value: []byte("bar"),
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  51,
+								EndPos:    52,
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  52,
+								EndPos:    53,
+							},
+						},
 						Stmt: &ast.StmtNop{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  53,
+								EndPos:    54,
+							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -4986,16 +10356,37 @@ func TestStmtClassMethod_AbstractClassMethod(t *testing.T) {
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  55,
+						EndPos:    56,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  54,
+								EndPos:    55,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5003,108 +10394,301 @@ func TestStmtClassMethod_Php7AbstractClassMethod(t *testing.T) {
 	src := `<? abstract class Foo{ public function bar(): void; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    53,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    53,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    53,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  18,
-							EndPos:    21,
-						},
-					},
-					Value: []byte("Foo"),
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    53,
 				},
 				Modifiers: []ast.Vertex{
 					&ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  3,
+							EndPos:    11,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_ABSTRACT,
+							Value: []byte("abstract"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    11,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("abstract"),
 					},
 				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  23,
-								EndPos:    51,
+								StartPos:  11,
+								EndPos:    12,
 							},
 						},
-						ReturnsRef: false,
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
+					},
+				},
+				ClassName: &ast.Identifier{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    21,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    21,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  39,
-									EndPos:    42,
+									StartPos:  17,
+									EndPos:    18,
 								},
 							},
-							Value: []byte("bar"),
+						},
+					},
+					Value: []byte("Foo"),
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    22,
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtClassMethod{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    51,
 						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    29,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PUBLIC,
+									Value: []byte("public"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  23,
 										EndPos:    29,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  22,
+												EndPos:    23,
+											},
+										},
+									},
 								},
 								Value: []byte("public"),
 							},
 						},
-						ReturnType: &ast.NameName{
-							Node: ast.Node{
+						FunctionTkn: &token.Token{
+							ID:    token.T_FUNCTION,
+							Value: []byte("function"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    38,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  29,
+										EndPos:    30,
+									},
+								},
+							},
+						},
+						MethodName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  39,
+								EndPos:    42,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  46,
-									EndPos:    50,
+									StartPos:  39,
+									EndPos:    42,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  38,
+											EndPos:    39,
+										},
+									},
+								},
+							},
+							Value: []byte("bar"),
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  42,
+								EndPos:    43,
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  43,
+								EndPos:    44,
+							},
+						},
+						ColonTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  44,
+								EndPos:    45,
+							},
+						},
+						ReturnType: &ast.NameName{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  46,
+								EndPos:    50,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  46,
+										EndPos:    50,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("void"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  46,
 											EndPos:    50,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  45,
+													EndPos:    46,
+												},
+											},
+										},
 									},
 									Value: []byte("void"),
 								},
 							},
 						},
 						Stmt: &ast.StmtNop{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  50,
+								EndPos:    51,
+							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -5115,16 +10699,37 @@ func TestStmtClassMethod_Php7AbstractClassMethod(t *testing.T) {
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  52,
+						EndPos:    53,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  51,
+								EndPos:    52,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5132,46 +10737,125 @@ func TestStmtClass_SimpleClass(t *testing.T) {
 	src := `<? class foo{ }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    14,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5179,59 +10863,158 @@ func TestStmtClass_AbstractClass(t *testing.T) {
 	src := `<? abstract class foo{ }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    24,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    24,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    24,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  18,
-							EndPos:    21,
-						},
-					},
-					Value: []byte("foo"),
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    24,
 				},
 				Modifiers: []ast.Vertex{
 					&ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  3,
+							EndPos:    11,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_ABSTRACT,
+							Value: []byte("abstract"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    11,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("abstract"),
 					},
 				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
+					},
+				},
+				ClassName: &ast.Identifier{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    21,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    21,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  17,
+									EndPos:    18,
+								},
+							},
+						},
+					},
+					Value: []byte("foo"),
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    22,
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  23,
+						EndPos:    24,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  22,
+								EndPos:    23,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5239,92 +11022,241 @@ func TestStmtClass_ClassExtends(t *testing.T) {
 	src := `<? final class foo extends bar { }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    34,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    34,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    34,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  15,
-							EndPos:    18,
-						},
-					},
-					Value: []byte("foo"),
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    34,
 				},
 				Modifiers: []ast.Vertex{
 					&ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  3,
+							EndPos:    8,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_FINAL,
+							Value: []byte("final"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    8,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("final"),
 					},
 				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				ClassName: &ast.Identifier{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    18,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    18,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    15,
+								},
+							},
+						},
+					},
+					Value: []byte("foo"),
+				},
 				Extends: &ast.StmtClassExtends{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    30,
+					},
+					ExtendTkn: &token.Token{
+						ID:    token.T_EXTENDS,
+						Value: []byte("extends"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  19,
-							EndPos:    30,
+							EndPos:    26,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  18,
+									EndPos:    19,
+								},
+							},
 						},
 					},
 					ClassName: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  27,
-								EndPos:    30,
-							},
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  27,
+							EndPos:    30,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    30,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("bar"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  27,
 										EndPos:    30,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  26,
+												EndPos:    27,
+											},
+										},
+									},
 								},
 								Value: []byte("bar"),
 							},
 						},
 					},
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  31,
+						EndPos:    32,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    31,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  33,
+						EndPos:    34,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  32,
+								EndPos:    33,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5332,76 +11264,182 @@ func TestStmtClass_ClassImplement(t *testing.T) {
 	src := `<? final class foo implements bar { }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    37,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    37,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    37,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  15,
-							EndPos:    18,
-						},
-					},
-					Value: []byte("foo"),
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    37,
 				},
 				Modifiers: []ast.Vertex{
 					&ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  3,
+							EndPos:    8,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_FINAL,
+							Value: []byte("final"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    8,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("final"),
 					},
 				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				ClassName: &ast.Identifier{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    18,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    18,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    15,
+								},
+							},
+						},
+					},
+					Value: []byte("foo"),
+				},
 				Implements: &ast.StmtClassImplements{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    33,
+					},
+					ImplementsTkn: &token.Token{
+						ID:    token.T_IMPLEMENTS,
+						Value: []byte("implements"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  19,
-							EndPos:    33,
+							EndPos:    29,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  18,
+									EndPos:    19,
+								},
+							},
 						},
 					},
 					InterfaceNames: []ast.Vertex{
 						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  30,
-									EndPos:    33,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    33,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  30,
+										EndPos:    33,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    33,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    30,
+												},
+											},
+										},
 									},
 									Value: []byte("bar"),
 								},
@@ -5409,17 +11447,60 @@ func TestStmtClass_ClassImplement(t *testing.T) {
 						},
 					},
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  34,
+						EndPos:    35,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  33,
+								EndPos:    34,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  36,
+						EndPos:    37,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  35,
+								EndPos:    36,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5427,117 +11508,296 @@ func TestStmtClass_ClassImplements(t *testing.T) {
 	src := `<? final class foo implements bar, baz { }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    42,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    42,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    42,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  15,
-							EndPos:    18,
-						},
-					},
-					Value: []byte("foo"),
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    42,
 				},
 				Modifiers: []ast.Vertex{
 					&ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  3,
+							EndPos:    8,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_FINAL,
+							Value: []byte("final"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    8,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("final"),
 					},
 				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				ClassName: &ast.Identifier{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    18,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    18,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    15,
+								},
+							},
+						},
+					},
+					Value: []byte("foo"),
+				},
 				Implements: &ast.StmtClassImplements{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    38,
+					},
+					ImplementsTkn: &token.Token{
+						ID:    token.T_IMPLEMENTS,
+						Value: []byte("implements"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  19,
-							EndPos:    38,
+							EndPos:    29,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  18,
+									EndPos:    19,
+								},
+							},
 						},
 					},
 					InterfaceNames: []ast.Vertex{
 						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  30,
-									EndPos:    33,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    33,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  30,
+										EndPos:    33,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    33,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    30,
+												},
+											},
+										},
 									},
 									Value: []byte("bar"),
 								},
 							},
 						},
 						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  35,
-									EndPos:    38,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  35,
+								EndPos:    38,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  35,
+										EndPos:    38,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("baz"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  35,
 											EndPos:    38,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  34,
+													EndPos:    35,
+												},
+											},
+										},
 									},
 									Value: []byte("baz"),
 								},
 							},
 						},
 					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  33,
+								EndPos:    34,
+							},
+						},
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  39,
+						EndPos:    40,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  38,
+								EndPos:    39,
+							},
+						},
+					},
 				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  41,
+						EndPos:    42,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  40,
+								EndPos:    41,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5545,79 +11805,173 @@ func TestStmtClass_AnonimousClass(t *testing.T) {
 	src := `<? new class() extends foo implements bar, baz { };`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    51,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    51,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    51,
+				},
+				Expr: &ast.ExprNew{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    51,
+						EndPos:    50,
 					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
+					NewTkn: &token.Token{
+						ID:    token.T_NEW,
+						Value: []byte("new"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    50,
+							EndPos:    6,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Class: &ast.StmtClass{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    50,
+						},
+						ClassTkn: &token.Token{
+							ID:    token.T_CLASS,
+							Value: []byte("class"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
-								EndPos:    50,
+								EndPos:    12,
 							},
-						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    14,
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  6,
+										EndPos:    7,
+									},
 								},
 							},
 						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    14,
+							},
+						},
 						Extends: &ast.StmtClassExtends{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    26,
+							},
+							ExtendTkn: &token.Token{
+								ID:    token.T_EXTENDS,
+								Value: []byte("extends"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
-									EndPos:    26,
+									EndPos:    22,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
 								},
 							},
 							ClassName: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  23,
-										EndPos:    26,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    26,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  23,
+											EndPos:    26,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("foo"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  23,
 												EndPos:    26,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  22,
+														EndPos:    23,
+													},
+												},
+											},
 										},
 										Value: []byte("foo"),
 									},
@@ -5625,76 +11979,197 @@ func TestStmtClass_AnonimousClass(t *testing.T) {
 							},
 						},
 						Implements: &ast.StmtClassImplements{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  27,
+								EndPos:    46,
+							},
+							ImplementsTkn: &token.Token{
+								ID:    token.T_IMPLEMENTS,
+								Value: []byte("implements"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  27,
-									EndPos:    46,
+									EndPos:    37,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  26,
+											EndPos:    27,
+										},
+									},
 								},
 							},
 							InterfaceNames: []ast.Vertex{
 								&ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  38,
-											EndPos:    41,
-										},
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  38,
+										EndPos:    41,
 									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  38,
+												EndPos:    41,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("bar"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  38,
 													EndPos:    41,
 												},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 1,
+															EndLine:   1,
+															StartPos:  37,
+															EndPos:    38,
+														},
+													},
+												},
 											},
 											Value: []byte("bar"),
 										},
 									},
 								},
 								&ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  43,
-											EndPos:    46,
-										},
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  43,
+										EndPos:    46,
 									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  43,
+												EndPos:    46,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("baz"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  43,
 													EndPos:    46,
 												},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 1,
+															EndLine:   1,
+															StartPos:  42,
+															EndPos:    43,
+														},
+													},
+												},
 											},
 											Value: []byte("baz"),
 										},
 									},
 								},
 							},
+							SeparatorTkns: []*token.Token{
+								{
+									ID:    token.ID(44),
+									Value: []byte(","),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  41,
+										EndPos:    42,
+									},
+								},
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  47,
+								EndPos:    48,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  46,
+										EndPos:    47,
+									},
+								},
+							},
 						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  49,
+								EndPos:    50,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  48,
+										EndPos:    49,
+									},
+								},
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  50,
+						EndPos:    51,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5702,100 +12177,269 @@ func TestStmtConstList(t *testing.T) {
 	src := `<? const FOO = 1, BAR = 2;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    26,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    26,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtConstList{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				ConstTkn: &token.Token{
+					ID:    token.T_CONST,
+					Value: []byte("const"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    26,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Consts: []ast.Vertex{
 					&ast.StmtConstant{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    16,
+						},
+						Name: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
-								EndPos:    16,
+								EndPos:    12,
 							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("FOO"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    12,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  8,
+											EndPos:    9,
+										},
+									},
+								},
 							},
 							Value: []byte("FOO"),
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    14,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    13,
+									},
+								},
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    16,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
+								},
 							},
 							Value: []byte("1"),
 						},
 					},
 					&ast.StmtConstant{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    25,
+						},
+						Name: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
-								EndPos:    25,
+								EndPos:    21,
 							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("BAR"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  18,
 									EndPos:    21,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  17,
+											EndPos:    18,
+										},
+									},
+								},
 							},
 							Value: []byte("BAR"),
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  22,
+								EndPos:    23,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  21,
+										EndPos:    22,
+									},
+								},
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("2"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  24,
 									EndPos:    25,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  23,
+											EndPos:    24,
+										},
+									},
+								},
 							},
 							Value: []byte("2"),
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    17,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  25,
+						EndPos:    26,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5803,26 +12447,84 @@ func TestStmtContinue_Empty(t *testing.T) {
 	src := `<? while (1) { continue; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    26,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    26,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtWhile{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				WhileTkn: &token.Token{
+					ID:    token.T_WHILE,
+					Value: []byte("while"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    26,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
 					},
 				},
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -5832,38 +12534,119 @@ func TestStmtContinue_Empty(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    26,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  13,
-							EndPos:    26,
+							EndPos:    14,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{
 						&ast.StmtContinue{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    24,
+							},
+							ContinueTkn: &token.Token{
+								ID:    token.T_CONTINUE,
+								Value: []byte("continue"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
+									EndPos:    23,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
+								},
+							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
 									EndPos:    24,
 								},
 							},
 						},
 					},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  25,
+							EndPos:    26,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  24,
+									EndPos:    25,
+								},
+							},
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5871,26 +12654,84 @@ func TestStmtContinue_Light(t *testing.T) {
 	src := `<? while (1) { continue 2; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    28,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    28,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtWhile{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    28,
+				},
+				WhileTkn: &token.Token{
+					ID:    token.T_WHILE,
+					Value: []byte("while"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    28,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
 					},
 				},
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -5900,49 +12741,150 @@ func TestStmtContinue_Light(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    28,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  13,
-							EndPos:    28,
+							EndPos:    14,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{
 						&ast.StmtContinue{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    26,
+							},
+							ContinueTkn: &token.Token{
+								ID:    token.T_CONTINUE,
+								Value: []byte("continue"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
-									EndPos:    26,
+									EndPos:    23,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
 								},
 							},
 							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  24,
+									EndPos:    25,
+								},
+								NumberTkn: &token.Token{
+									ID:    token.T_LNUMBER,
+									Value: []byte("2"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  24,
 										EndPos:    25,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  23,
+												EndPos:    24,
+											},
+										},
+									},
 								},
 								Value: []byte("2"),
 							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  25,
+									EndPos:    26,
+								},
+							},
+						},
+					},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  27,
+							EndPos:    28,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  26,
+									EndPos:    27,
+								},
+							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5950,26 +12892,84 @@ func TestStmtContinue(t *testing.T) {
 	src := `<? while (1) { continue(3); }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    29,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    29,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtWhile{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    29,
+				},
+				WhileTkn: &token.Token{
+					ID:    token.T_WHILE,
+					Value: []byte("while"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    29,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
 					},
 				},
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -5979,49 +12979,166 @@ func TestStmtContinue(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    29,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  13,
-							EndPos:    29,
+							EndPos:    14,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{
 						&ast.StmtContinue{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    27,
+							},
+							ContinueTkn: &token.Token{
+								ID:    token.T_CONTINUE,
+								Value: []byte("continue"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
-									EndPos:    27,
+									EndPos:    23,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
 								},
 							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
+							Expr: &ast.ParserBrackets{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    26,
+								},
+								OpenBracketTkn: &token.Token{
+									ID:    token.ID(40),
+									Value: []byte("("),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  23,
+										EndPos:    24,
+									},
+								},
+								Child: &ast.ScalarLnumber{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  24,
 										EndPos:    25,
 									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("3"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  24,
+											EndPos:    25,
+										},
+									},
+									Value: []byte("3"),
+								},
+								CloseBracketTkn: &token.Token{
+									ID:    token.ID(41),
+									Value: []byte(")"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  25,
+										EndPos:    26,
+									},
+								},
+							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  26,
+									EndPos:    27,
+								},
+							},
+						},
+					},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  28,
+							EndPos:    29,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    28,
 								},
-								Value: []byte("3"),
 							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6029,36 +13146,80 @@ func TestStmtDeclare(t *testing.T) {
 	src := `<? declare(ticks=1);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    20,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    20,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtDeclare{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    20,
+				},
+				DeclareTkn: &token.Token{
+					ID:    token.T_DECLARE,
+					Value: []byte("declare"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    20,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
 					},
 				},
 				Consts: []ast.Vertex{
 					&ast.StmtConstant{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    18,
+						},
+						Name: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  11,
-								EndPos:    18,
+								EndPos:    16,
 							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("ticks"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -6068,8 +13229,26 @@ func TestStmtDeclare(t *testing.T) {
 							},
 							Value: []byte("ticks"),
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  17,
+								EndPos:    18,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -6081,8 +13260,26 @@ func TestStmtDeclare(t *testing.T) {
 						},
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 				Stmt: &ast.StmtNop{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    20,
+					},
+					SemiColonTkn: &token.Token{
+						ID:    token.ID(59),
+						Value: []byte(";"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -6093,14 +13290,13 @@ func TestStmtDeclare(t *testing.T) {
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6108,36 +13304,80 @@ func TestStmtDeclare_Stmts(t *testing.T) {
 	src := `<? declare(ticks=1, strict_types=1) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    38,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    38,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtDeclare{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    38,
+				},
+				DeclareTkn: &token.Token{
+					ID:    token.T_DECLARE,
+					Value: []byte("declare"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    38,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
 					},
 				},
 				Consts: []ast.Vertex{
 					&ast.StmtConstant{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    18,
+						},
+						Name: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  11,
-								EndPos:    18,
+								EndPos:    16,
 							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("ticks"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -6147,8 +13387,26 @@ func TestStmtDeclare_Stmts(t *testing.T) {
 							},
 							Value: []byte("ticks"),
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  17,
+								EndPos:    18,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -6160,27 +13418,63 @@ func TestStmtDeclare_Stmts(t *testing.T) {
 						},
 					},
 					&ast.StmtConstant{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    34,
+						},
+						Name: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  20,
-								EndPos:    34,
+								EndPos:    32,
 							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("strict_types"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  20,
 									EndPos:    32,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    20,
+										},
+									},
+								},
 							},
 							Value: []byte("strict_types"),
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  32,
+								EndPos:    33,
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  33,
+								EndPos:    34,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -6192,27 +13486,78 @@ func TestStmtDeclare_Stmts(t *testing.T) {
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    19,
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  34,
+						EndPos:    35,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  36,
+						EndPos:    38,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  36,
-							EndPos:    38,
+							EndPos:    37,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  35,
+									EndPos:    36,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  37,
+							EndPos:    38,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6220,36 +13565,80 @@ func TestStmtDeclare_Alt(t *testing.T) {
 	src := `<? declare(ticks=1): enddeclare;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    32,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    32,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtDeclare{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    32,
+				},
+				DeclareTkn: &token.Token{
+					ID:    token.T_DECLARE,
+					Value: []byte("declare"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    32,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
 					},
 				},
 				Consts: []ast.Vertex{
 					&ast.StmtConstant{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    18,
+						},
+						Name: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  11,
-								EndPos:    18,
+								EndPos:    16,
 							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("ticks"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -6259,8 +13648,26 @@ func TestStmtDeclare_Alt(t *testing.T) {
 							},
 							Value: []byte("ticks"),
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  17,
+								EndPos:    18,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -6272,28 +13679,76 @@ func TestStmtDeclare_Alt(t *testing.T) {
 						},
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    20,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
+					Position: &position.Position{
+						StartLine: -1,
+						EndLine:   -1,
+						StartPos:  -1,
+						EndPos:    -1,
 					},
 					Stmts: []ast.Vertex{},
 				},
-				Alt: true,
+				EndDeclareTkn: &token.Token{
+					ID:    token.T_ENDDECLARE,
+					Value: []byte("enddeclare"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    31,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    21,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  31,
+						EndPos:    32,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6301,37 +13756,135 @@ func TestStmtDo(t *testing.T) {
 	src := `<? do {} while(1);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    18,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    18,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtDo{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    18,
+				},
+				DoTkn: &token.Token{
+					ID:    token.T_DO,
+					Value: []byte("do"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    18,
+						EndPos:    5,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    8,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  6,
-							EndPos:    8,
+							EndPos:    7,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
+						},
+					},
+				},
+				WhileTkn: &token.Token{
+					ID:    token.T_WHILE,
+					Value: []byte("while"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
 				},
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -6341,16 +13894,35 @@ func TestStmtDo(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6358,68 +13930,155 @@ func TestStmtEcho(t *testing.T) {
 	src := `<? echo $a, 1;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtEcho{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				EchoTkn: &token.Token{
+					ID:    token.T_ECHO,
+					Value: []byte("echo"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Exprs: []ast.Vertex{
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    10,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  8,
 								EndPos:    10,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
 									EndPos:    10,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  7,
+											EndPos:    8,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 					&ast.ScalarLnumber{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+						NumberTkn: &token.Token{
+							ID:    token.T_LNUMBER,
+							Value: []byte("1"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
 								EndPos:    13,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  11,
+										EndPos:    12,
+									},
+								},
+							},
 						},
 						Value: []byte("1"),
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6427,57 +14086,128 @@ func TestStmtEcho_Parenthesis(t *testing.T) {
 	src := `<? echo($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtEcho{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				EchoTkn: &token.Token{
+					ID:    token.T_ECHO,
+					Value: []byte("echo"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Exprs: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
+					&ast.ParserBrackets{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    11,
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    8,
+							},
+						},
+						Child: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  8,
 								EndPos:    10,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
 									EndPos:    10,
 								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    10,
+									},
+								},
+								Value: []byte("$a"),
 							},
-							Value: []byte("$a"),
 						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6485,45 +14215,80 @@ func TestStmtExpression(t *testing.T) {
 	src := `<? 1;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    5,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    5,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    5,
+				},
+				Expr: &ast.ScalarLnumber{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    5,
+						EndPos:    4,
 					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    4,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("1"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  4,
+						EndPos:    5,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6531,45 +14296,87 @@ func TestStmtFor(t *testing.T) {
 	src := `<? for($i = 0; $i < 10; $i++, $i++) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    38,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    38,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFor{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    38,
+				},
+				ForTkn: &token.Token{
+					ID:    token.T_FOR,
+					Value: []byte("for"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    38,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
 					},
 				},
 				Init: []ast.Vertex{
 					&ast.ExprAssign{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    13,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
-								EndPos:    13,
+								EndPos:    9,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  7,
 									EndPos:    9,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$i"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -6580,148 +14387,371 @@ func TestStmtFor(t *testing.T) {
 								Value: []byte("$i"),
 							},
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  9,
+										EndPos:    10,
+									},
+								},
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("0"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  12,
 									EndPos:    13,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  11,
+											EndPos:    12,
+										},
+									},
+								},
 							},
 							Value: []byte("0"),
 						},
 					},
 				},
+				InitSemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+				},
 				Cond: []ast.Vertex{
 					&ast.ExprBinarySmaller{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    22,
+						},
+						Left: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
-								EndPos:    22,
+								EndPos:    17,
 							},
-						},
-						Left: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
 									EndPos:    17,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$i"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  15,
 										EndPos:    17,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  14,
+												EndPos:    15,
+											},
+										},
+									},
 								},
 								Value: []byte("$i"),
 							},
 						},
+						OpTkn: &token.Token{
+							ID:    token.ID(60),
+							Value: []byte("<"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  18,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
+						},
 						Right: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    22,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("10"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  20,
 									EndPos:    22,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    20,
+										},
+									},
+								},
 							},
 							Value: []byte("10"),
 						},
 					},
 				},
+				CondSemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
 				Loop: []ast.Vertex{
 					&ast.ExprPostInc{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  24,
+							EndPos:    28,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  24,
-								EndPos:    28,
+								EndPos:    26,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  24,
 									EndPos:    26,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$i"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  24,
 										EndPos:    26,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  23,
+												EndPos:    24,
+											},
+										},
+									},
 								},
 								Value: []byte("$i"),
 							},
 						},
+						IncTkn: &token.Token{
+							ID:    token.T_INC,
+							Value: []byte("++"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  26,
+								EndPos:    28,
+							},
+						},
 					},
 					&ast.ExprPostInc{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  30,
+							EndPos:    34,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  30,
-								EndPos:    34,
+								EndPos:    32,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  30,
 									EndPos:    32,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$i"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
 										EndPos:    32,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  29,
+												EndPos:    30,
+											},
+										},
+									},
 								},
 								Value: []byte("$i"),
 							},
 						},
+						IncTkn: &token.Token{
+							ID:    token.T_INC,
+							Value: []byte("++"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  32,
+								EndPos:    34,
+							},
+						},
+					},
+				},
+				LoopSeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  28,
+							EndPos:    29,
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  34,
+						EndPos:    35,
 					},
 				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  36,
+						EndPos:    38,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  36,
-							EndPos:    38,
+							EndPos:    37,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  35,
+									EndPos:    36,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  37,
+							EndPos:    38,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6729,123 +14759,325 @@ func TestStmtFor_Alt(t *testing.T) {
 	src := `<? for(; $i < 10; $i++) : endfor;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    33,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    33,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFor{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    33,
+				},
+				ForTkn: &token.Token{
+					ID:    token.T_FOR,
+					Value: []byte("for"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    33,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+				},
+				InitSemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
 					},
 				},
-				Alt: true,
 				Cond: []ast.Vertex{
 					&ast.ExprBinarySmaller{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    16,
+						},
+						Left: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
-								EndPos:    16,
+								EndPos:    11,
 							},
-						},
-						Left: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$i"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  9,
 										EndPos:    11,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  8,
+												EndPos:    9,
+											},
+										},
+									},
 								},
 								Value: []byte("$i"),
 							},
 						},
+						OpTkn: &token.Token{
+							ID:    token.ID(60),
+							Value: []byte("<"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  11,
+										EndPos:    12,
+									},
+								},
+							},
+						},
 						Right: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    16,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("10"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  14,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  13,
+											EndPos:    14,
+										},
+									},
+								},
 							},
 							Value: []byte("10"),
 						},
 					},
 				},
+				CondSemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
 				Loop: []ast.Vertex{
 					&ast.ExprPostInc{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    22,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
-								EndPos:    22,
+								EndPos:    20,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  18,
 									EndPos:    20,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$i"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  18,
 										EndPos:    20,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  17,
+												EndPos:    18,
+											},
+										},
+									},
 								},
 								Value: []byte("$i"),
 							},
 						},
+						IncTkn: &token.Token{
+							ID:    token.T_INC,
+							Value: []byte("++"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    22,
+							},
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  24,
+						EndPos:    25,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  23,
+								EndPos:    24,
+							},
+						},
 					},
 				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
+					Position: &position.Position{
+						StartLine: -1,
+						EndLine:   -1,
+						StartPos:  -1,
+						EndPos:    -1,
 					},
 					Stmts: []ast.Vertex{},
 				},
+				EndForTkn: &token.Token{
+					ID:    token.T_ENDFOR,
+					Value: []byte("endfor"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  26,
+						EndPos:    32,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    26,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  32,
+						EndPos:    33,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6853,35 +15085,91 @@ func TestStmtForeach(t *testing.T) {
 	src := `<? foreach ($a as $v) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    24,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    24,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtForeach{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    24,
+				},
+				ForeachTkn: &token.Token{
+					ID:    token.T_FOREACH,
+					Value: []byte("foreach"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    24,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
 					},
 				},
 				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    14,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    14,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -6892,48 +15180,127 @@ func TestStmtForeach(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				AsTkn: &token.Token{
+					ID:    token.T_AS,
+					Value: []byte("as"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
+				},
 				Var: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    20,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  18,
 							EndPos:    20,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$v"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
 						},
 						Value: []byte("$v"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    24,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  22,
-							EndPos:    24,
+							EndPos:    23,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  21,
+									EndPos:    22,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    24,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6941,77 +15308,223 @@ func TestStmtForeach_Expr(t *testing.T) {
 	src := `<? foreach ([] as $v) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    24,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    24,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtForeach{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    24,
+				},
+				ForeachTkn: &token.Token{
+					ID:    token.T_FOREACH,
+					Value: []byte("foreach"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    24,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
+					},
+				},
+				Expr: &ast.ExprArray{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    14,
+					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(91),
+						Value: []byte("["),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
+							EndPos:    13,
+						},
+					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(93),
+						Value: []byte("]"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
 							EndPos:    14,
 						},
 					},
-					Items: []ast.Vertex{},
+				},
+				AsTkn: &token.Token{
+					ID:    token.T_AS,
+					Value: []byte("as"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
 				},
 				Var: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    20,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  18,
 							EndPos:    20,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$v"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
 						},
 						Value: []byte("$v"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    24,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  22,
-							EndPos:    24,
+							EndPos:    23,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  21,
+									EndPos:    22,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    24,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7019,36 +15532,91 @@ func TestStmtForeach_Alt(t *testing.T) {
 	src := `<? foreach ($a as $v) : endforeach;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    35,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    35,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtForeach{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    35,
+				},
+				ForeachTkn: &token.Token{
+					ID:    token.T_FOREACH,
+					Value: []byte("foreach"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    35,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
 					},
 				},
-				Alt: true,
 				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    14,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    14,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -7059,48 +15627,149 @@ func TestStmtForeach_Alt(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				AsTkn: &token.Token{
+					ID:    token.T_AS,
+					Value: []byte("as"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
+				},
 				Var: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    20,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  18,
 							EndPos:    20,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$v"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
 						},
 						Value: []byte("$v"),
 					},
 				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  21,
+								EndPos:    22,
+							},
 						},
 					},
+				},
+				Stmt: &ast.StmtStmtList{
+					Position: &position.Position{
+						StartLine: -1,
+						EndLine:   -1,
+						StartPos:  -1,
+						EndPos:    -1,
+					},
 					Stmts: []ast.Vertex{},
 				},
+				EndForeachTkn: &token.Token{
+					ID:    token.T_ENDFOREACH,
+					Value: []byte("endforeach"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  24,
+						EndPos:    34,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  23,
+								EndPos:    24,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  34,
+						EndPos:    35,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7108,35 +15777,91 @@ func TestStmtForeach_WithKey(t *testing.T) {
 	src := `<? foreach ($a as $k => $v) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    30,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    30,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtForeach{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    30,
+				},
+				ForeachTkn: &token.Token{
+					ID:    token.T_FOREACH,
+					Value: []byte("foreach"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    30,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
 					},
 				},
 				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    14,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    14,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -7147,69 +15872,188 @@ func TestStmtForeach_WithKey(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				AsTkn: &token.Token{
+					ID:    token.T_AS,
+					Value: []byte("as"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
+				},
 				Key: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    20,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  18,
 							EndPos:    20,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$k"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
 						},
 						Value: []byte("$k"),
 					},
 				},
+				DoubleArrowTkn: &token.Token{
+					ID:    token.T_DOUBLE_ARROW,
+					Value: []byte("=>"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    23,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    21,
+							},
+						},
+					},
+				},
 				Var: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  24,
+						EndPos:    26,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  24,
 							EndPos:    26,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$v"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  24,
 								EndPos:    26,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  23,
+										EndPos:    24,
+									},
+								},
+							},
 						},
 						Value: []byte("$v"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  26,
+						EndPos:    27,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  28,
+						EndPos:    30,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  28,
-							EndPos:    30,
+							EndPos:    29,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    28,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  29,
+							EndPos:    30,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7217,98 +16061,284 @@ func TestStmtForeach_ExprWithKey(t *testing.T) {
 	src := `<? foreach ([] as $k => $v) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    30,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    30,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtForeach{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    30,
+				},
+				ForeachTkn: &token.Token{
+					ID:    token.T_FOREACH,
+					Value: []byte("foreach"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    30,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
+					},
+				},
+				Expr: &ast.ExprArray{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    14,
+					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(91),
+						Value: []byte("["),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
+							EndPos:    13,
+						},
+					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(93),
+						Value: []byte("]"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
 							EndPos:    14,
 						},
 					},
-					Items: []ast.Vertex{},
+				},
+				AsTkn: &token.Token{
+					ID:    token.T_AS,
+					Value: []byte("as"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
 				},
 				Key: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    20,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  18,
 							EndPos:    20,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$k"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
 						},
 						Value: []byte("$k"),
 					},
 				},
+				DoubleArrowTkn: &token.Token{
+					ID:    token.T_DOUBLE_ARROW,
+					Value: []byte("=>"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    23,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    21,
+							},
+						},
+					},
+				},
 				Var: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  24,
+						EndPos:    26,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  24,
 							EndPos:    26,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$v"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  24,
 								EndPos:    26,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  23,
+										EndPos:    24,
+									},
+								},
+							},
 						},
 						Value: []byte("$v"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  26,
+						EndPos:    27,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  28,
+						EndPos:    30,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  28,
-							EndPos:    30,
+							EndPos:    29,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    28,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  29,
+							EndPos:    30,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7316,35 +16346,91 @@ func TestStmtForeach_WithRef(t *testing.T) {
 	src := `<? foreach ($a as $k => &$v) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    31,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    31,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtForeach{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    31,
+				},
+				ForeachTkn: &token.Token{
+					ID:    token.T_FOREACH,
+					Value: []byte("foreach"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    31,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
 					},
 				},
 				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    14,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    14,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -7355,47 +16441,135 @@ func TestStmtForeach_WithRef(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				AsTkn: &token.Token{
+					ID:    token.T_AS,
+					Value: []byte("as"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
+				},
 				Key: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    20,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  18,
 							EndPos:    20,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$k"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
 						},
 						Value: []byte("$k"),
 					},
 				},
+				DoubleArrowTkn: &token.Token{
+					ID:    token.T_DOUBLE_ARROW,
+					Value: []byte("=>"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    23,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    21,
+							},
+						},
+					},
+				},
 				Var: &ast.ExprReference{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  24,
+						EndPos:    27,
+					},
+					AmpersandTkn: &token.Token{
+						ID:    token.ID(38),
+						Value: []byte("&"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  24,
-							EndPos:    27,
+							EndPos:    25,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
+								},
+							},
 						},
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  25,
+							EndPos:    27,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  25,
 								EndPos:    27,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$v"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -7407,27 +16581,66 @@ func TestStmtForeach_WithRef(t *testing.T) {
 						},
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  27,
+						EndPos:    28,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  29,
+						EndPos:    31,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  29,
-							EndPos:    31,
+							EndPos:    30,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  28,
+									EndPos:    29,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  30,
+							EndPos:    31,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7435,35 +16648,91 @@ func TestStmtForeach_WithList(t *testing.T) {
 	src := `<? foreach ($a as $k => list($v)) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    36,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    36,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtForeach{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    36,
+				},
+				ForeachTkn: &token.Token{
+					ID:    token.T_FOREACH,
+					Value: []byte("foreach"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    36,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
 					},
 				},
 				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    14,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    14,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -7474,57 +16743,153 @@ func TestStmtForeach_WithList(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				AsTkn: &token.Token{
+					ID:    token.T_AS,
+					Value: []byte("as"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
+				},
 				Key: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    20,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  18,
 							EndPos:    20,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$k"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
 						},
 						Value: []byte("$k"),
 					},
 				},
+				DoubleArrowTkn: &token.Token{
+					ID:    token.T_DOUBLE_ARROW,
+					Value: []byte("=>"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    23,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    21,
+							},
+						},
+					},
+				},
 				Var: &ast.ExprList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  24,
+						EndPos:    32,
+					},
+					ListTkn: &token.Token{
+						ID:    token.T_LIST,
+						Value: []byte("list"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  24,
-							EndPos:    32,
+							EndPos:    28,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
+								},
+							},
+						},
+					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  28,
+							EndPos:    29,
 						},
 					},
 					Items: []ast.Vertex{
 						&ast.ExprArrayItem{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  29,
+								EndPos:    31,
+							},
+							Val: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  29,
 									EndPos:    31,
 								},
-							},
-							Val: &ast.ExprVariable{
-								Node: ast.Node{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  29,
 										EndPos:    31,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$v"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -7537,28 +16902,77 @@ func TestStmtForeach_WithList(t *testing.T) {
 							},
 						},
 					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  31,
+							EndPos:    32,
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  32,
+						EndPos:    33,
+					},
 				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  34,
+						EndPos:    36,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  34,
-							EndPos:    36,
+							EndPos:    35,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  33,
+									EndPos:    34,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  35,
+							EndPos:    36,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7566,47 +16980,145 @@ func TestStmtFunction(t *testing.T) {
 	src := `<? function foo() {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    20,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    20,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFunction{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    20,
+				},
+				FunctionTkn: &token.Token{
+					ID:    token.T_FUNCTION,
+					Value: []byte("function"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    20,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    15,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    15,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  11,
+									EndPos:    12,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  17,
+								EndPos:    18,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    20,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7614,58 +17126,174 @@ func TestStmtFunction_Return(t *testing.T) {
 	src := `<? function foo() {return;}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    27,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    27,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFunction{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    27,
+				},
+				FunctionTkn: &token.Token{
+					ID:    token.T_FUNCTION,
+					Value: []byte("function"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    27,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    15,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    15,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  11,
+									EndPos:    12,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  17,
+								EndPos:    18,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtReturn{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  19,
+							EndPos:    26,
+						},
+						ReturnTkn: &token.Token{
+							ID:    token.T_RETURN,
+							Value: []byte("return"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  19,
+								EndPos:    25,
+							},
+						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
 								EndPos:    26,
 							},
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  26,
+						EndPos:    27,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7673,48 +17301,111 @@ func TestStmtFunction_ReturnVar(t *testing.T) {
 	src := `<? function foo(array $a, callable $b) {return $a;}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    51,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    51,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFunction{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    51,
+				},
+				FunctionTkn: &token.Token{
+					ID:    token.T_FUNCTION,
+					Value: []byte("function"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    51,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
-				ReturnsRef: false,
 				FunctionName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    15,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    15,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  11,
+									EndPos:    12,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
+				},
 				Params: []ast.Vertex{
 					&ast.Parameter{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    24,
+						},
+						Type: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
-								EndPos:    24,
+								EndPos:    21,
 							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_ARRAY,
+								Value: []byte("array"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -7725,113 +17416,256 @@ func TestStmtFunction_ReturnVar(t *testing.T) {
 							Value: []byte("array"),
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  22,
+								EndPos:    24,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  22,
 									EndPos:    24,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  22,
 										EndPos:    24,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  21,
+												EndPos:    22,
+											},
+										},
+									},
 								},
 								Value: []byte("$a"),
 							},
 						},
 					},
 					&ast.Parameter{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  26,
+							EndPos:    37,
+						},
+						Type: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  26,
-								EndPos:    37,
+								EndPos:    34,
 							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_CALLABLE,
+								Value: []byte("callable"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  26,
 									EndPos:    34,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  25,
+											EndPos:    26,
+										},
+									},
+								},
 							},
 							Value: []byte("callable"),
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  35,
+								EndPos:    37,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  35,
 									EndPos:    37,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  35,
 										EndPos:    37,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  34,
+												EndPos:    35,
+											},
+										},
+									},
 								},
 								Value: []byte("$b"),
 							},
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  24,
+							EndPos:    25,
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  37,
+						EndPos:    38,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  39,
+						EndPos:    40,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  38,
+								EndPos:    39,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtReturn{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  40,
+							EndPos:    50,
+						},
+						ReturnTkn: &token.Token{
+							ID:    token.T_RETURN,
+							Value: []byte("return"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  40,
-								EndPos:    50,
+								EndPos:    46,
 							},
 						},
 						Expr: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  47,
+								EndPos:    49,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  47,
 									EndPos:    49,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  47,
 										EndPos:    49,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  46,
+												EndPos:    47,
+											},
+										},
+									},
 								},
 								Value: []byte("$a"),
 							},
 						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  49,
+								EndPos:    50,
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  50,
+						EndPos:    51,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7839,27 +17673,84 @@ func TestStmtFunction_Ref(t *testing.T) {
 	src := `<? function &foo() {return 1;}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    30,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    30,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFunction{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    30,
+				},
+				FunctionTkn: &token.Token{
+					ID:    token.T_FUNCTION,
+					Value: []byte("function"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    30,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				AmpersandTkn: &token.Token{
+					ID:    token.ID(38),
+					Value: []byte("&"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
 					},
 				},
-				ReturnsRef: true,
 				FunctionName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    16,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -7869,39 +17760,128 @@ func TestStmtFunction_Ref(t *testing.T) {
 					},
 					Value: []byte("foo"),
 				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    20,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  18,
+								EndPos:    19,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtReturn{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    29,
+						},
+						ReturnTkn: &token.Token{
+							ID:    token.T_RETURN,
+							Value: []byte("return"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  20,
-								EndPos:    29,
+								EndPos:    26,
 							},
 						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  27,
+								EndPos:    28,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  27,
 									EndPos:    28,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  26,
+											EndPos:    27,
+										},
+									},
+								},
 							},
 							Value: []byte("1"),
 						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    29,
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  29,
+						EndPos:    30,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7909,27 +17889,84 @@ func TestStmtFunction_ReturnType(t *testing.T) {
 	src := `<? function &foo(): void {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    27,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    27,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFunction{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    27,
+				},
+				FunctionTkn: &token.Token{
+					ID:    token.T_FUNCTION,
+					Value: []byte("function"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    27,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				AmpersandTkn: &token.Token{
+					ID:    token.ID(38),
+					Value: []byte("&"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
 					},
 				},
-				ReturnsRef: true,
 				FunctionName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    16,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -7939,40 +17976,119 @@ func TestStmtFunction_ReturnType(t *testing.T) {
 					},
 					Value: []byte("foo"),
 				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 				ReturnType: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  20,
-							EndPos:    24,
-						},
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    24,
 					},
 					Parts: []ast.Vertex{
 						&ast.NameNamePart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    24,
+							},
+							StringTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("void"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  20,
 									EndPos:    24,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    20,
+										},
+									},
+								},
 							},
 							Value: []byte("void"),
 						},
 					},
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  25,
+						EndPos:    26,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  26,
+						EndPos:    27,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7980,57 +18096,112 @@ func TestStmtGlobal(t *testing.T) {
 	src := `<? global $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtGlobal{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				GlobalTkn: &token.Token{
+					ID:    token.T_GLOBAL,
+					Value: []byte("global"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Vars: []ast.Vertex{
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    12,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  10,
 								EndPos:    12,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  10,
 									EndPos:    12,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  9,
+											EndPos:    10,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8038,87 +18209,177 @@ func TestStmtGlobal_Vars(t *testing.T) {
 	src := `<? global $a, $b, $$c, ${foo()};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    32,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    32,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtGlobal{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    32,
+				},
+				GlobalTkn: &token.Token{
+					ID:    token.T_GLOBAL,
+					Value: []byte("global"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    32,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Vars: []ast.Vertex{
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    12,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  10,
 								EndPos:    12,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  10,
 									EndPos:    12,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  9,
+											EndPos:    10,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    16,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
 								EndPos:    16,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  14,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  13,
+											EndPos:    14,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    21,
+						},
+						DollarTkn: &token.Token{
+							ID:    token.ID(36),
+							Value: []byte("$"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
-								EndPos:    21,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
 							},
 						},
 						VarName: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  19,
+								EndPos:    21,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  19,
 									EndPos:    21,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$c"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -8131,69 +18392,172 @@ func TestStmtGlobal_Vars(t *testing.T) {
 						},
 					},
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    31,
+						},
+						DollarTkn: &token.Token{
+							ID:    token.ID(36),
+							Value: []byte("$"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  23,
-								EndPos:    31,
+								EndPos:    24,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  22,
+										EndPos:    23,
+									},
+								},
 							},
 						},
-						VarName: &ast.ExprFunctionCall{
-							Node: ast.Node{
+						VarName: &ast.ParserBrackets{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    31,
+							},
+							OpenBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  24,
+									EndPos:    25,
+								},
+							},
+							Child: &ast.ExprFunctionCall{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  25,
 									EndPos:    30,
 								},
-							},
-							Function: &ast.NameName{
-								Node: ast.Node{
+								Function: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  25,
 										EndPos:    28,
 									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
+									Parts: []ast.Vertex{
+										&ast.NameNamePart{
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  25,
 												EndPos:    28,
 											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("foo"),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  25,
+													EndPos:    28,
+												},
+											},
+											Value: []byte("foo"),
 										},
-										Value: []byte("foo"),
 									},
 								},
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
+								OpenParenthesisTkn: &token.Token{
+									ID:    token.ID(40),
+									Value: []byte("("),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  28,
+										EndPos:    29,
+									},
+								},
+								CloseParenthesisTkn: &token.Token{
+									ID:    token.ID(41),
+									Value: []byte(")"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  29,
 										EndPos:    30,
 									},
 								},
 							},
+							CloseBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  30,
+									EndPos:    31,
+								},
+							},
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    17,
+						},
+					},
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    22,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  31,
+						EndPos:    32,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8201,66 +18565,151 @@ func TestStmtGotoLabel(t *testing.T) {
 	src := `<? a: goto a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtLabel{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    5,
+				},
+				LabelName: &ast.Identifier{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    5,
+						EndPos:    4,
 					},
-				},
-				LabelName: &ast.Identifier{
-					Node: ast.Node{
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("a"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    4,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
 					},
 					Value: []byte("a"),
 				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  4,
+						EndPos:    5,
+					},
+				},
 			},
 			&ast.StmtGoto{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  6,
+					EndPos:    13,
+				},
+				GotoTkn: &token.Token{
+					ID:    token.T_GOTO,
+					Value: []byte("goto"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  6,
-						EndPos:    13,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    6,
+							},
+						},
 					},
 				},
 				Label: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("a"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  11,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+							},
+						},
 					},
 					Value: []byte("a"),
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8268,34 +18717,91 @@ func TestStmtHaltCompiler(t *testing.T) {
 	src := `<? __halt_compiler();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    21,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    21,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtHaltCompiler{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    21,
+				},
+				HaltCompilerTkn: &token.Token{
+					ID:    token.T_HALT_COMPILER,
+					Value: []byte("__halt_compiler"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
+						EndPos:    18,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    20,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
 						EndPos:    21,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8303,35 +18809,91 @@ func TestStmtIf(t *testing.T) {
 	src := `<? if ($a) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    5,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    6,
+							},
+						},
 					},
 				},
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    9,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    9,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -8342,27 +18904,66 @@ func TestStmtIf(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    13,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  11,
-							EndPos:    13,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8370,35 +18971,91 @@ func TestStmtIf_ElseIf(t *testing.T) {
 	src := `<? if ($a) {} elseif ($b) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    28,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    28,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    28,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    28,
+						EndPos:    5,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    6,
+							},
+						},
 					},
 				},
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    9,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    9,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -8409,38 +19066,126 @@ func TestStmtIf_ElseIf(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    13,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  11,
-							EndPos:    13,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
 				},
 				ElseIf: []ast.Vertex{
 					&ast.StmtElseIf{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    28,
+						},
+						ElseIfTkn: &token.Token{
+							ID:    token.T_ELSEIF,
+							Value: []byte("elseif"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
-								EndPos:    28,
+								EndPos:    20,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    14,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  21,
+								EndPos:    22,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  20,
+										EndPos:    21,
+									},
+								},
 							},
 						},
 						Cond: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  22,
+								EndPos:    24,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  22,
 									EndPos:    24,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -8451,29 +19196,68 @@ func TestStmtIf_ElseIf(t *testing.T) {
 								Value: []byte("$b"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  26,
+								EndPos:    28,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  26,
-									EndPos:    28,
+									EndPos:    27,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  25,
+											EndPos:    26,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    28,
+								},
+							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8481,35 +19265,91 @@ func TestStmtIf_Else(t *testing.T) {
 	src := `<? if ($a) {} else {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    21,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    21,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    21,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    21,
+						EndPos:    5,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    6,
+							},
+						},
 					},
 				},
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    9,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    9,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -8520,48 +19360,137 @@ func TestStmtIf_Else(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    13,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  11,
-							EndPos:    13,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
 				},
 				Else: &ast.StmtElse{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    21,
+					},
+					ElseTkn: &token.Token{
+						ID:    token.T_ELSE,
+						Value: []byte("else"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  14,
-							EndPos:    21,
+							EndPos:    18,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    14,
+								},
+							},
 						},
 					},
 					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  19,
+							EndPos:    21,
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  19,
-								EndPos:    21,
+								EndPos:    20,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  18,
+										EndPos:    19,
+									},
+								},
 							},
 						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    21,
+							},
+						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8569,35 +19498,91 @@ func TestStmtIf_ElseElseIf(t *testing.T) {
 	src := `<? if ($a) {} elseif ($b) {} elseif ($c) {} else {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    51,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    51,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    51,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    51,
+						EndPos:    5,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    6,
+							},
+						},
 					},
 				},
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    9,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    9,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -8608,38 +19593,126 @@ func TestStmtIf_ElseElseIf(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    13,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  11,
-							EndPos:    13,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
 				},
 				ElseIf: []ast.Vertex{
 					&ast.StmtElseIf{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    28,
+						},
+						ElseIfTkn: &token.Token{
+							ID:    token.T_ELSEIF,
+							Value: []byte("elseif"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
-								EndPos:    28,
+								EndPos:    20,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    14,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  21,
+								EndPos:    22,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  20,
+										EndPos:    21,
+									},
+								},
 							},
 						},
 						Cond: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  22,
+								EndPos:    24,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  22,
 									EndPos:    24,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -8650,38 +19723,126 @@ func TestStmtIf_ElseElseIf(t *testing.T) {
 								Value: []byte("$b"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  26,
+								EndPos:    28,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  26,
-									EndPos:    28,
+									EndPos:    27,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  25,
+											EndPos:    26,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    28,
+								},
+							},
 						},
 					},
 					&ast.StmtElseIf{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  29,
+							EndPos:    43,
+						},
+						ElseIfTkn: &token.Token{
+							ID:    token.T_ELSEIF,
+							Value: []byte("elseif"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  29,
-								EndPos:    43,
+								EndPos:    35,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  28,
+										EndPos:    29,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  36,
+								EndPos:    37,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  35,
+										EndPos:    36,
+									},
+								},
 							},
 						},
 						Cond: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  37,
+								EndPos:    39,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  37,
 									EndPos:    39,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$c"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -8692,50 +19853,139 @@ func TestStmtIf_ElseElseIf(t *testing.T) {
 								Value: []byte("$c"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  39,
+								EndPos:    40,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  41,
+								EndPos:    43,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  41,
-									EndPos:    43,
+									EndPos:    42,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  40,
+											EndPos:    41,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  42,
+									EndPos:    43,
+								},
+							},
 						},
 					},
 				},
 				Else: &ast.StmtElse{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  44,
+						EndPos:    51,
+					},
+					ElseTkn: &token.Token{
+						ID:    token.T_ELSE,
+						Value: []byte("else"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  44,
-							EndPos:    51,
+							EndPos:    48,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  43,
+									EndPos:    44,
+								},
+							},
 						},
 					},
 					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  49,
+							EndPos:    51,
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  49,
-								EndPos:    51,
+								EndPos:    50,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  48,
+										EndPos:    49,
+									},
+								},
 							},
 						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  50,
+								EndPos:    51,
+							},
+						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8743,35 +19993,91 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) {
 	src := `<? if ($a) {} elseif ($b) {} else if ($c) {} else {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    52,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    52,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtIf{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    52,
+				},
+				IfTkn: &token.Token{
+					ID:    token.T_IF,
+					Value: []byte("if"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    52,
+						EndPos:    5,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    6,
+							},
+						},
 					},
 				},
 				Cond: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    9,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    9,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -8782,38 +20088,126 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    13,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  11,
-							EndPos:    13,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
 				},
 				ElseIf: []ast.Vertex{
 					&ast.StmtElseIf{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    28,
+						},
+						ElseIfTkn: &token.Token{
+							ID:    token.T_ELSEIF,
+							Value: []byte("elseif"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
-								EndPos:    28,
+								EndPos:    20,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    14,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  21,
+								EndPos:    22,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  20,
+										EndPos:    21,
+									},
+								},
 							},
 						},
 						Cond: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  22,
+								EndPos:    24,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  22,
 									EndPos:    24,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -8824,48 +20218,156 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) {
 								Value: []byte("$b"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  26,
+								EndPos:    28,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  26,
-									EndPos:    28,
+									EndPos:    27,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  25,
+											EndPos:    26,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    28,
+								},
+							},
 						},
 					},
 				},
 				Else: &ast.StmtElse{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  29,
+						EndPos:    52,
+					},
+					ElseTkn: &token.Token{
+						ID:    token.T_ELSE,
+						Value: []byte("else"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  29,
-							EndPos:    52,
+							EndPos:    33,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  28,
+									EndPos:    29,
+								},
+							},
 						},
 					},
 					Stmt: &ast.StmtIf{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  34,
+							EndPos:    52,
+						},
+						IfTkn: &token.Token{
+							ID:    token.T_IF,
+							Value: []byte("if"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  34,
-								EndPos:    52,
+								EndPos:    36,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  33,
+										EndPos:    34,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  37,
+								EndPos:    38,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  36,
+										EndPos:    37,
+									},
+								},
 							},
 						},
 						Cond: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  38,
+								EndPos:    40,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  38,
 									EndPos:    40,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$c"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -8876,50 +20378,139 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) {
 								Value: []byte("$c"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  40,
+								EndPos:    41,
+							},
+						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  42,
+								EndPos:    44,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  42,
-									EndPos:    44,
+									EndPos:    43,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  41,
+											EndPos:    42,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  43,
+									EndPos:    44,
+								},
+							},
 						},
 						Else: &ast.StmtElse{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  45,
+								EndPos:    52,
+							},
+							ElseTkn: &token.Token{
+								ID:    token.T_ELSE,
+								Value: []byte("else"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  45,
-									EndPos:    52,
+									EndPos:    49,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  44,
+											EndPos:    45,
+										},
+									},
 								},
 							},
 							Stmt: &ast.StmtStmtList{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  50,
+									EndPos:    52,
+								},
+								OpenCurlyBracketTkn: &token.Token{
+									ID:    token.ID(123),
+									Value: []byte("{"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  50,
-										EndPos:    52,
+										EndPos:    51,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  49,
+												EndPos:    50,
+											},
+										},
 									},
 								},
 								Stmts: []ast.Vertex{},
+								CloseCurlyBracketTkn: &token.Token{
+									ID:    token.ID(125),
+									Value: []byte("}"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  51,
+										EndPos:    52,
+									},
+								},
 							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8927,27 +20518,63 @@ func TestStmtInlineHtml(t *testing.T) {
 	src := `<? ?> <div></div>`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtNop{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    5,
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte("?>"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
 						EndPos:    5,
 					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
 				},
 			},
 			&ast.StmtInlineHtml{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  5,
+					EndPos:    17,
+				},
+				InlineHtmlTkn: &token.Token{
+					ID:    token.T_INLINE_HTML,
+					Value: []byte(" <div></div>"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
@@ -8958,14 +20585,13 @@ func TestStmtInlineHtml(t *testing.T) {
 				Value: []byte(" <div></div>"),
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8973,46 +20599,125 @@ func TestStmtInterface(t *testing.T) {
 	src := `<? interface Foo {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtInterface{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				InterfaceTkn: &token.Token{
+					ID:    token.T_INTERFACE,
+					Value: []byte("interface"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    16,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  13,
 							EndPos:    16,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9020,63 +20725,149 @@ func TestStmtInterface_Extend(t *testing.T) {
 	src := `<? interface Foo extends Bar {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    31,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    31,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtInterface{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    31,
+				},
+				InterfaceTkn: &token.Token{
+					ID:    token.T_INTERFACE,
+					Value: []byte("interface"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    31,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    16,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  13,
 							EndPos:    16,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
 				Extends: &ast.StmtInterfaceExtends{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    28,
+					},
+					ExtendsTkn: &token.Token{
+						ID:    token.T_EXTENDS,
+						Value: []byte("extends"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  17,
-							EndPos:    28,
+							EndPos:    24,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  16,
+									EndPos:    17,
+								},
+							},
 						},
 					},
 					InterfaceNames: []ast.Vertex{
 						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  25,
-									EndPos:    28,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    28,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  25,
+										EndPos:    28,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  25,
 											EndPos:    28,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  24,
+													EndPos:    25,
+												},
+											},
+										},
 									},
 									Value: []byte("Bar"),
 								},
@@ -9084,17 +20875,48 @@ func TestStmtInterface_Extend(t *testing.T) {
 						},
 					},
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  29,
+						EndPos:    30,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    29,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  30,
+						EndPos:    31,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9102,104 +20924,251 @@ func TestStmtInterface_Extends(t *testing.T) {
 	src := `<? interface Foo extends Bar, Baz {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    36,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    36,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtInterface{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    36,
+				},
+				InterfaceTkn: &token.Token{
+					ID:    token.T_INTERFACE,
+					Value: []byte("interface"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    36,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    16,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  13,
 							EndPos:    16,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
 				Extends: &ast.StmtInterfaceExtends{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    33,
+					},
+					ExtendsTkn: &token.Token{
+						ID:    token.T_EXTENDS,
+						Value: []byte("extends"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  17,
-							EndPos:    33,
+							EndPos:    24,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  16,
+									EndPos:    17,
+								},
+							},
 						},
 					},
 					InterfaceNames: []ast.Vertex{
 						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  25,
-									EndPos:    28,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    28,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  25,
+										EndPos:    28,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  25,
 											EndPos:    28,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  24,
+													EndPos:    25,
+												},
+											},
+										},
 									},
 									Value: []byte("Bar"),
 								},
 							},
 						},
 						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  30,
-									EndPos:    33,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    33,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  30,
+										EndPos:    33,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Baz"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    33,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    30,
+												},
+											},
+										},
 									},
 									Value: []byte("Baz"),
 								},
 							},
 						},
 					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    29,
+							},
+						},
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  34,
+						EndPos:    35,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  33,
+								EndPos:    34,
+							},
+						},
+					},
 				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  35,
+						EndPos:    36,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9207,57 +21176,112 @@ func TestStmtNamespace(t *testing.T) {
 	src := `<? namespace Foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtNamespace{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				NsTkn: &token.Token{
+					ID:    token.T_NAMESPACE,
+					Value: []byte("namespace"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Name: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  13,
-							EndPos:    16,
-						},
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    16,
 					},
 					Parts: []ast.Vertex{
 						&ast.NameNamePart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    16,
+							},
+							StringTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  12,
+											EndPos:    13,
+										},
+									},
+								},
 							},
 							Value: []byte("Foo"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9265,58 +21289,135 @@ func TestStmtNamespace_Stmts(t *testing.T) {
 	src := `<? namespace Foo {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtNamespace{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				NsTkn: &token.Token{
+					ID:    token.T_NAMESPACE,
+					Value: []byte("namespace"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Name: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  13,
-							EndPos:    16,
-						},
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    16,
 					},
 					Parts: []ast.Vertex{
 						&ast.NameNamePart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    16,
+							},
+							StringTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  12,
+											EndPos:    13,
+										},
+									},
+								},
 							},
 							Value: []byte("Foo"),
 						},
 					},
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9324,35 +21425,94 @@ func TestStmtNamespace_Anonymous(t *testing.T) {
 	src := `<? namespace {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtNamespace{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				NsTkn: &token.Token{
+					ID:    token.T_NAMESPACE,
+					Value: []byte("namespace"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
 					},
 				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9360,48 +21520,124 @@ func TestStmtProperty(t *testing.T) {
 	src := `<? class foo {var $a;}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    22,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    22,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    22,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    22,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  14,
-								EndPos:    21,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtPropertyList{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    21,
+						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    17,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VAR,
+									Value: []byte("var"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -9414,49 +21650,84 @@ func TestStmtProperty(t *testing.T) {
 						},
 						Properties: []ast.Vertex{
 							&ast.StmtProperty{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  18,
+									EndPos:    20,
+								},
+								Var: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  18,
 										EndPos:    20,
 									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  18,
 											EndPos:    20,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  18,
 												EndPos:    20,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  17,
+														EndPos:    18,
+													},
+												},
+											},
 										},
 										Value: []byte("$a"),
 									},
 								},
 							},
 						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    21,
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    22,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9464,48 +21735,124 @@ func TestStmtProperty_Properties(t *testing.T) {
 	src := `<? class foo {public static $a, $b = 1;}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    40,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    40,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    40,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    40,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  14,
-								EndPos:    39,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtPropertyList{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    39,
+						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    20,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PUBLIC,
+									Value: []byte("public"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -9516,104 +21863,229 @@ func TestStmtProperty_Properties(t *testing.T) {
 								Value: []byte("public"),
 							},
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  21,
+									EndPos:    27,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_STATIC,
+									Value: []byte("static"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  21,
 										EndPos:    27,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  20,
+												EndPos:    21,
+											},
+										},
+									},
 								},
 								Value: []byte("static"),
 							},
 						},
 						Properties: []ast.Vertex{
 							&ast.StmtProperty{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  28,
+									EndPos:    30,
+								},
+								Var: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  28,
 										EndPos:    30,
 									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  28,
 											EndPos:    30,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  28,
 												EndPos:    30,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  27,
+														EndPos:    28,
+													},
+												},
+											},
 										},
 										Value: []byte("$a"),
 									},
 								},
 							},
 							&ast.StmtProperty{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  32,
+									EndPos:    38,
+								},
+								Var: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  32,
-										EndPos:    38,
+										EndPos:    34,
 									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  32,
 											EndPos:    34,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$b"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  32,
 												EndPos:    34,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  31,
+														EndPos:    32,
+													},
+												},
+											},
 										},
 										Value: []byte("$b"),
 									},
 								},
+								EqualTkn: &token.Token{
+									ID:    token.ID(61),
+									Value: []byte("="),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  35,
+										EndPos:    36,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  34,
+												EndPos:    35,
+											},
+										},
+									},
+								},
 								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  37,
+										EndPos:    38,
+									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("1"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  37,
 											EndPos:    38,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  36,
+													EndPos:    37,
+												},
+											},
+										},
 									},
 									Value: []byte("1"),
 								},
 							},
 						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  30,
+									EndPos:    31,
+								},
+							},
+						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  38,
+								EndPos:    39,
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  39,
+						EndPos:    40,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9621,48 +22093,124 @@ func TestStmtProperty_Properties2(t *testing.T) {
 	src := `<? class foo {public static $a = 1, $b;}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    40,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    40,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    40,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    40,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  14,
-								EndPos:    39,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtPropertyList{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    39,
+						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    20,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PUBLIC,
+									Value: []byte("public"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -9673,104 +22221,229 @@ func TestStmtProperty_Properties2(t *testing.T) {
 								Value: []byte("public"),
 							},
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  21,
+									EndPos:    27,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_STATIC,
+									Value: []byte("static"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  21,
 										EndPos:    27,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  20,
+												EndPos:    21,
+											},
+										},
+									},
 								},
 								Value: []byte("static"),
 							},
 						},
 						Properties: []ast.Vertex{
 							&ast.StmtProperty{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  28,
+									EndPos:    34,
+								},
+								Var: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  28,
-										EndPos:    34,
+										EndPos:    30,
 									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  28,
 											EndPos:    30,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  28,
 												EndPos:    30,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  27,
+														EndPos:    28,
+													},
+												},
+											},
 										},
 										Value: []byte("$a"),
 									},
 								},
+								EqualTkn: &token.Token{
+									ID:    token.ID(61),
+									Value: []byte("="),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  31,
+										EndPos:    32,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  30,
+												EndPos:    31,
+											},
+										},
+									},
+								},
 								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  33,
+										EndPos:    34,
+									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("1"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  33,
 											EndPos:    34,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  32,
+													EndPos:    33,
+												},
+											},
+										},
 									},
 									Value: []byte("1"),
 								},
 							},
 							&ast.StmtProperty{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  36,
+									EndPos:    38,
+								},
+								Var: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  36,
 										EndPos:    38,
 									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  36,
 											EndPos:    38,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$b"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  36,
 												EndPos:    38,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  35,
+														EndPos:    36,
+													},
+												},
+											},
 										},
 										Value: []byte("$b"),
 									},
 								},
 							},
 						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  34,
+									EndPos:    35,
+								},
+							},
+						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  38,
+								EndPos:    39,
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  39,
+						EndPos:    40,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9778,48 +22451,124 @@ func TestStmtProperty_PropertyType(t *testing.T) {
 	src := `<? class foo {var bar $a;}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    26,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    26,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    26,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("foo"),
 				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  14,
-								EndPos:    25,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtPropertyList{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    25,
+						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    17,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VAR,
+									Value: []byte("var"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -9831,23 +22580,41 @@ func TestStmtProperty_PropertyType(t *testing.T) {
 							},
 						},
 						Type: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  18,
-									EndPos:    21,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  18,
+								EndPos:    21,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  18,
+										EndPos:    21,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  18,
 											EndPos:    21,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  17,
+													EndPos:    18,
+												},
+											},
+										},
 									},
 									Value: []byte("bar"),
 								},
@@ -9855,49 +22622,84 @@ func TestStmtProperty_PropertyType(t *testing.T) {
 						},
 						Properties: []ast.Vertex{
 							&ast.StmtProperty{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  22,
+									EndPos:    24,
+								},
+								Var: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  22,
 										EndPos:    24,
 									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  22,
 											EndPos:    24,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  22,
 												EndPos:    24,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  21,
+														EndPos:    22,
+													},
+												},
+											},
 										},
 										Value: []byte("$a"),
 									},
 								},
 							},
 						},
+						SemiColonTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  25,
+						EndPos:    26,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9905,67 +22707,120 @@ func TestStmtStaticVar(t *testing.T) {
 	src := `<? static $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtStatic{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				StaticTkn: &token.Token{
+					ID:    token.T_STATIC,
+					Value: []byte("static"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Vars: []ast.Vertex{
 					&ast.StmtStaticVar{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    12,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  10,
 								EndPos:    12,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  10,
 									EndPos:    12,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  10,
 										EndPos:    12,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  9,
+												EndPos:    10,
+											},
+										},
+									},
 								},
 								Value: []byte("$a"),
 							},
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9973,109 +22828,232 @@ func TestStmtStaticVar_Vars(t *testing.T) {
 	src := `<? static $a, $b = 1;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    21,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    21,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtStatic{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    21,
+				},
+				StaticTkn: &token.Token{
+					ID:    token.T_STATIC,
+					Value: []byte("static"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    21,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Vars: []ast.Vertex{
 					&ast.StmtStaticVar{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    12,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  10,
 								EndPos:    12,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  10,
 									EndPos:    12,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  10,
 										EndPos:    12,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  9,
+												EndPos:    10,
+											},
+										},
+									},
 								},
 								Value: []byte("$a"),
 							},
 						},
 					},
 					&ast.StmtStaticVar{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    20,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
-								EndPos:    20,
+								EndPos:    16,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  14,
 									EndPos:    16,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  14,
 										EndPos:    16,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  13,
+												EndPos:    14,
+											},
+										},
+									},
 								},
 								Value: []byte("$b"),
 							},
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  17,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    17,
+									},
+								},
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  19,
+								EndPos:    20,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  19,
 									EndPos:    20,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  18,
+											EndPos:    19,
+										},
+									},
+								},
 							},
 							Value: []byte("1"),
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10083,114 +23061,237 @@ func TestStmtStaticVar_Vars2(t *testing.T) {
 	src := `<? static $a = 1, $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    21,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    21,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtStatic{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    21,
+				},
+				StaticTkn: &token.Token{
+					ID:    token.T_STATIC,
+					Value: []byte("static"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    21,
+						EndPos:    9,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Vars: []ast.Vertex{
 					&ast.StmtStaticVar{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    16,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  10,
-								EndPos:    16,
+								EndPos:    12,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  10,
 									EndPos:    12,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  10,
 										EndPos:    12,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  9,
+												EndPos:    10,
+											},
+										},
+									},
 								},
 								Value: []byte("$a"),
 							},
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    14,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    13,
+									},
+								},
+							},
+						},
 						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    16,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
+								},
 							},
 							Value: []byte("1"),
 						},
 					},
 					&ast.StmtStaticVar{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    20,
+						},
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  18,
 									EndPos:    20,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  18,
 										EndPos:    20,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  17,
+												EndPos:    18,
+											},
+										},
+									},
 								},
 								Value: []byte("$b"),
 							},
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    17,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestStmtSwitch(t *testing.T) {
-	src := `<? 
+	src := `<?
 		switch (1) {
 			case 1: break;
 			case 2: break;
@@ -10198,101 +23299,387 @@ func TestStmtSwitch(t *testing.T) {
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   5,
-				StartPos:  6,
-				EndPos:    58,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   5,
+			StartPos:  5,
+			EndPos:    57,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtSwitch{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   5,
+					StartPos:  5,
+					EndPos:    57,
+				},
+				SwitchTkn: &token.Token{
+					ID:    token.T_SWITCH,
+					Value: []byte("switch"),
 					Position: &position.Position{
 						StartLine: 2,
-						EndLine:   5,
-						StartPos:  6,
-						EndPos:    58,
+						EndLine:   2,
+						StartPos:  5,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  12,
+						EndPos:    13,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
 					},
 				},
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  14,
-							EndPos:    15,
+							StartPos:  13,
+							EndPos:    14,
 						},
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  16,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  15,
+								EndPos:    16,
+							},
+						},
+					},
+				},
 				CaseList: []ast.Vertex{
 					&ast.StmtCase{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  21,
+							EndPos:    35,
+						},
+						CaseTkn: &token.Token{
+							ID:    token.T_CASE,
+							Value: []byte("case"),
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  22,
-								EndPos:    36,
+								StartPos:  21,
+								EndPos:    25,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   3,
+										StartPos:  17,
+										EndPos:    21,
+									},
+								},
 							},
 						},
 						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  26,
+								EndPos:    27,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  27,
-									EndPos:    28,
+									StartPos:  26,
+									EndPos:    27,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  25,
+											EndPos:    26,
+										},
+									},
 								},
 							},
 							Value: []byte("1"),
 						},
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  27,
+								EndPos:    28,
+							},
+						},
 						Stmts: []ast.Vertex{
 							&ast.StmtBreak{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  29,
+									EndPos:    35,
+								},
+								BreakTkn: &token.Token{
+									ID:    token.T_BREAK,
+									Value: []byte("break"),
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  30,
-										EndPos:    36,
+										StartPos:  29,
+										EndPos:    34,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 3,
+												EndLine:   3,
+												StartPos:  28,
+												EndPos:    29,
+											},
+										},
+									},
+								},
+								SemiColonTkn: &token.Token{
+									ID:    token.ID(59),
+									Value: []byte(";"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  34,
+										EndPos:    35,
 									},
 								},
 							},
 						},
 					},
 					&ast.StmtCase{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  39,
+							EndPos:    53,
+						},
+						CaseTkn: &token.Token{
+							ID:    token.T_CASE,
+							Value: []byte("case"),
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  40,
-								EndPos:    54,
+								StartPos:  39,
+								EndPos:    43,
 							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 4,
-									EndLine:   4,
-									StartPos:  45,
-									EndPos:    46,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
 									Position: &position.Position{
-										StartLine: 4,
+										StartLine: 3,
 										EndLine:   4,
-										StartPos:  48,
-										EndPos:    54,
+										StartPos:  35,
+										EndPos:    39,
 									},
 								},
 							},
 						},
+						Cond: &ast.ScalarLnumber{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  44,
+								EndPos:    45,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("2"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  44,
+									EndPos:    45,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  43,
+											EndPos:    44,
+										},
+									},
+								},
+							},
+							Value: []byte("2"),
+						},
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  45,
+								EndPos:    46,
+							},
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  47,
+									EndPos:    53,
+								},
+								BreakTkn: &token.Token{
+									ID:    token.T_BREAK,
+									Value: []byte("break"),
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  47,
+										EndPos:    52,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 4,
+												EndLine:   4,
+												StartPos:  46,
+												EndPos:    47,
+											},
+										},
+									},
+								},
+								SemiColonTkn: &token.Token{
+									ID:    token.ID(59),
+									Value: []byte(";"),
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  52,
+										EndPos:    53,
+									},
+								},
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  56,
+						EndPos:    57,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   5,
+								StartPos:  53,
+								EndPos:    56,
+							},
+						},
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   6,
+						StartPos:  57,
+						EndPos:    59,
 					},
 				},
 			},
@@ -10303,13 +23690,11 @@ func TestStmtSwitch(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestStmtSwitch_Semicolon(t *testing.T) {
-	src := `<? 
+	src := `<?
 		switch (1) {;
 			case 1; break;
 			case 2; break;
@@ -10317,101 +23702,397 @@ func TestStmtSwitch_Semicolon(t *testing.T) {
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   5,
-				StartPos:  6,
-				EndPos:    59,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   5,
+			StartPos:  5,
+			EndPos:    58,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtSwitch{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   5,
+					StartPos:  5,
+					EndPos:    58,
+				},
+				SwitchTkn: &token.Token{
+					ID:    token.T_SWITCH,
+					Value: []byte("switch"),
 					Position: &position.Position{
 						StartLine: 2,
-						EndLine:   5,
-						StartPos:  6,
-						EndPos:    59,
+						EndLine:   2,
+						StartPos:  5,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  12,
+						EndPos:    13,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
 					},
 				},
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  14,
-							EndPos:    15,
+							StartPos:  13,
+							EndPos:    14,
 						},
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  16,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  15,
+								EndPos:    16,
+							},
+						},
+					},
+				},
+				CaseSeparatorTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
 				CaseList: []ast.Vertex{
 					&ast.StmtCase{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  22,
+							EndPos:    36,
+						},
+						CaseTkn: &token.Token{
+							ID:    token.T_CASE,
+							Value: []byte("case"),
 							Position: &position.Position{
 								StartLine: 3,
 								EndLine:   3,
-								StartPos:  23,
-								EndPos:    37,
+								StartPos:  22,
+								EndPos:    26,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   3,
+										StartPos:  18,
+										EndPos:    22,
+									},
+								},
 							},
 						},
 						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  27,
+								EndPos:    28,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  28,
-									EndPos:    29,
+									StartPos:  27,
+									EndPos:    28,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  26,
+											EndPos:    27,
+										},
+									},
 								},
 							},
 							Value: []byte("1"),
 						},
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  28,
+								EndPos:    29,
+							},
+						},
 						Stmts: []ast.Vertex{
 							&ast.StmtBreak{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  30,
+									EndPos:    36,
+								},
+								BreakTkn: &token.Token{
+									ID:    token.T_BREAK,
+									Value: []byte("break"),
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
-										StartPos:  31,
-										EndPos:    37,
+										StartPos:  30,
+										EndPos:    35,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 3,
+												EndLine:   3,
+												StartPos:  29,
+												EndPos:    30,
+											},
+										},
+									},
+								},
+								SemiColonTkn: &token.Token{
+									ID:    token.ID(59),
+									Value: []byte(";"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  35,
+										EndPos:    36,
 									},
 								},
 							},
 						},
 					},
 					&ast.StmtCase{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  40,
+							EndPos:    54,
+						},
+						CaseTkn: &token.Token{
+							ID:    token.T_CASE,
+							Value: []byte("case"),
 							Position: &position.Position{
 								StartLine: 4,
 								EndLine:   4,
-								StartPos:  41,
-								EndPos:    55,
+								StartPos:  40,
+								EndPos:    44,
 							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 4,
-									EndLine:   4,
-									StartPos:  46,
-									EndPos:    47,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
 									Position: &position.Position{
-										StartLine: 4,
+										StartLine: 3,
 										EndLine:   4,
-										StartPos:  49,
-										EndPos:    55,
+										StartPos:  36,
+										EndPos:    40,
 									},
 								},
 							},
 						},
+						Cond: &ast.ScalarLnumber{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  45,
+								EndPos:    46,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("2"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  45,
+									EndPos:    46,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  44,
+											EndPos:    45,
+										},
+									},
+								},
+							},
+							Value: []byte("2"),
+						},
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  46,
+								EndPos:    47,
+							},
+						},
+						Stmts: []ast.Vertex{
+							&ast.StmtBreak{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  48,
+									EndPos:    54,
+								},
+								BreakTkn: &token.Token{
+									ID:    token.T_BREAK,
+									Value: []byte("break"),
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  48,
+										EndPos:    53,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 4,
+												EndLine:   4,
+												StartPos:  47,
+												EndPos:    48,
+											},
+										},
+									},
+								},
+								SemiColonTkn: &token.Token{
+									ID:    token.ID(59),
+									Value: []byte(";"),
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  53,
+										EndPos:    54,
+									},
+								},
+							},
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  57,
+						EndPos:    58,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   5,
+								StartPos:  54,
+								EndPos:    57,
+							},
+						},
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   6,
+						StartPos:  58,
+						EndPos:    60,
 					},
 				},
 			},
@@ -10422,13 +24103,11 @@ func TestStmtSwitch_Semicolon(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestStmtSwitch_Alt(t *testing.T) {
-	src := `<? 
+	src := `<?
 		switch (1) :
 			case 1:
 			default:
@@ -10437,201 +24116,693 @@ func TestStmtSwitch_Alt(t *testing.T) {
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   6,
-				StartPos:  6,
-				EndPos:    65,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   6,
+			StartPos:  5,
+			EndPos:    64,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtSwitch{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   6,
+					StartPos:  5,
+					EndPos:    64,
+				},
+				SwitchTkn: &token.Token{
+					ID:    token.T_SWITCH,
+					Value: []byte("switch"),
 					Position: &position.Position{
 						StartLine: 2,
-						EndLine:   6,
-						StartPos:  6,
-						EndPos:    65,
+						EndLine:   2,
+						StartPos:  5,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  12,
+						EndPos:    13,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
 					},
 				},
-				Alt: true,
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  14,
-							EndPos:    15,
+							StartPos:  13,
+							EndPos:    14,
 						},
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  16,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  15,
+								EndPos:    16,
+							},
+						},
+					},
+				},
 				CaseList: []ast.Vertex{
 					&ast.StmtCase{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   -1,
+							StartPos:  21,
+							EndPos:    -1,
+						},
+						CaseTkn: &token.Token{
+							ID:    token.T_CASE,
+							Value: []byte("case"),
 							Position: &position.Position{
 								StartLine: 3,
-								EndLine:   -1,
-								StartPos:  22,
-								EndPos:    -1,
+								EndLine:   3,
+								StartPos:  21,
+								EndPos:    25,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   3,
+										StartPos:  17,
+										EndPos:    21,
+									},
+								},
 							},
 						},
 						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  26,
+								EndPos:    27,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  26,
+									EndPos:    27,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  25,
+											EndPos:    26,
+										},
+									},
+								},
+							},
+							Value: []byte("1"),
+						},
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  27,
+								EndPos:    28,
+							},
+						},
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtDefault{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   -1,
+							StartPos:  32,
+							EndPos:    -1,
+						},
+						DefaultTkn: &token.Token{
+							ID:    token.T_DEFAULT,
+							Value: []byte("default"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  32,
+								EndPos:    39,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   4,
+										StartPos:  28,
+										EndPos:    32,
+									},
+								},
+							},
+						},
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  39,
+								EndPos:    40,
+							},
+						},
+						Stmts: []ast.Vertex{},
+					},
+					&ast.StmtCase{
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   -1,
+							StartPos:  44,
+							EndPos:    -1,
+						},
+						CaseTkn: &token.Token{
+							ID:    token.T_CASE,
+							Value: []byte("case"),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  44,
+								EndPos:    48,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   5,
+										StartPos:  40,
+										EndPos:    44,
+									},
+								},
+							},
+						},
+						Cond: &ast.ScalarLnumber{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  49,
+								EndPos:    50,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("2"),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  49,
+									EndPos:    50,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  48,
+											EndPos:    49,
+										},
+									},
+								},
+							},
+							Value: []byte("2"),
+						},
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  50,
+								EndPos:    51,
+							},
+						},
+						Stmts: []ast.Vertex{},
+					},
+				},
+				EndSwitchTkn: &token.Token{
+					ID:    token.T_ENDSWITCH,
+					Value: []byte("endswitch"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  54,
+						EndPos:    63,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   6,
+								StartPos:  51,
+								EndPos:    54,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  63,
+						EndPos:    64,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   7,
+						StartPos:  64,
+						EndPos:    66,
+					},
+				},
+			},
+		},
+	}
+
+	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
+	php7parser := php7.NewParser(lexer, nil)
+	php7parser.Parse()
+	actual := php7parser.GetRootNode()
+	assert.DeepEqual(t, expected, actual)
+}
+
+func TestStmtSwitch_AltSemicolon(t *testing.T) {
+	src := `<?
+		switch (1) :;
+			case 1;
+			case 2;
+		endswitch;`
+
+	expected := &ast.Root{
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   5,
+			StartPos:  5,
+			EndPos:    53,
+		},
+		Stmts: []ast.Vertex{
+			&ast.StmtSwitch{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   5,
+					StartPos:  5,
+					EndPos:    53,
+				},
+				SwitchTkn: &token.Token{
+					ID:    token.T_SWITCH,
+					Value: []byte("switch"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  5,
+						EndPos:    11,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  12,
+						EndPos:    13,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
+					},
+				},
+				Cond: &ast.ScalarLnumber{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  13,
+							EndPos:    14,
+						},
+					},
+					Value: []byte("1"),
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  16,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  15,
+								EndPos:    16,
+							},
+						},
+					},
+				},
+				CaseSeparatorTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
+				CaseList: []ast.Vertex{
+					&ast.StmtCase{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   -1,
+							StartPos:  22,
+							EndPos:    -1,
+						},
+						CaseTkn: &token.Token{
+							ID:    token.T_CASE,
+							Value: []byte("case"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  22,
+								EndPos:    26,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   3,
+										StartPos:  18,
+										EndPos:    22,
+									},
+								},
+							},
+						},
+						Cond: &ast.ScalarLnumber{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  27,
+								EndPos:    28,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
 									StartPos:  27,
 									EndPos:    28,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  26,
+											EndPos:    27,
+										},
+									},
+								},
 							},
 							Value: []byte("1"),
 						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtDefault{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 4,
-								EndLine:   -1,
-								StartPos:  33,
-								EndPos:    -1,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 5,
-								EndLine:   -1,
-								StartPos:  45,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 5,
-									EndLine:   5,
-									StartPos:  50,
-									EndPos:    51,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestStmtSwitch_AltSemicolon(t *testing.T) {
-	src := `<? 
-		switch (1) :;
-			case 1;
-			case 2;
-		endswitch;
-	`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   5,
-				StartPos:  6,
-				EndPos:    54,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 2,
-						EndLine:   5,
-						StartPos:  6,
-						EndPos:    54,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 2,
-							EndLine:   2,
-							StartPos:  14,
-							EndPos:    15,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
 							Position: &position.Position{
 								StartLine: 3,
-								EndLine:   -1,
-								StartPos:  23,
-								EndPos:    -1,
+								EndLine:   3,
+								StartPos:  28,
+								EndPos:    29,
 							},
 						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 3,
-									EndLine:   3,
-									StartPos:  28,
-									EndPos:    29,
-								},
-							},
-							Value: []byte("1"),
-						},
 						Stmts: []ast.Vertex{},
 					},
 					&ast.StmtCase{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   -1,
+							StartPos:  33,
+							EndPos:    -1,
+						},
+						CaseTkn: &token.Token{
+							ID:    token.T_CASE,
+							Value: []byte("case"),
 							Position: &position.Position{
 								StartLine: 4,
-								EndLine:   -1,
-								StartPos:  34,
-								EndPos:    -1,
+								EndLine:   4,
+								StartPos:  33,
+								EndPos:    37,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   4,
+										StartPos:  29,
+										EndPos:    33,
+									},
+								},
 							},
 						},
 						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  38,
+								EndPos:    39,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("2"),
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
-									StartPos:  39,
-									EndPos:    40,
+									StartPos:  38,
+									EndPos:    39,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  37,
+											EndPos:    38,
+										},
+									},
 								},
 							},
 							Value: []byte("2"),
 						},
+						CaseSeparatorTkn: &token.Token{
+							ID:    token.ID(59),
+							Value: []byte(";"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  39,
+								EndPos:    40,
+							},
+						},
 						Stmts: []ast.Vertex{},
 					},
 				},
+				EndSwitchTkn: &token.Token{
+					ID:    token.T_ENDSWITCH,
+					Value: []byte("endswitch"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  43,
+						EndPos:    52,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   5,
+								StartPos:  40,
+								EndPos:    43,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  52,
+						EndPos:    53,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10639,55 +24810,110 @@ func TestStmtThrow(t *testing.T) {
 	src := `<? throw $e;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtThrow{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				ThrowTkn: &token.Token{
+					ID:    token.T_THROW,
+					Value: []byte("throw"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    11,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    11,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$e"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    9,
+									},
+								},
+							},
 						},
 						Value: []byte("$e"),
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10695,46 +24921,125 @@ func TestStmtTrait(t *testing.T) {
 	src := `<? trait Foo {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtTrait{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				TraitTkn: &token.Token{
+					ID:    token.T_TRAIT,
+					Value: []byte("trait"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				TraitName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10742,72 +25047,188 @@ func TestStmtTraitUse(t *testing.T) {
 	src := `<? class Foo { use Bar; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    25,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    25,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    25,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    25,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtTraitUse{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    23,
+						},
+						UseTkn: &token.Token{
+							ID:    token.T_USE,
+							Value: []byte("use"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
-								EndPos:    23,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    15,
+									},
+								},
 							},
 						},
 						Traits: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    22,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    22,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    22,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Bar"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  19,
 												EndPos:    22,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  18,
+														EndPos:    19,
+													},
+												},
+											},
 										},
 										Value: []byte("Bar"),
 									},
 								},
 							},
 						},
-						TraitAdaptationList: &ast.StmtNop{
-							Node: ast.Node{
+						Adaptations: &ast.StmtNop{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  22,
+								EndPos:    23,
+							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -10818,16 +25239,37 @@ func TestStmtTraitUse(t *testing.T) {
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  24,
+						EndPos:    25,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  23,
+								EndPos:    24,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10835,95 +25277,241 @@ func TestStmtTraitUse_Uses(t *testing.T) {
 	src := `<? class Foo { use Bar, Baz; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    30,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    30,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    30,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    30,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtTraitUse{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    28,
+						},
+						UseTkn: &token.Token{
+							ID:    token.T_USE,
+							Value: []byte("use"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
-								EndPos:    28,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    15,
+									},
+								},
 							},
 						},
 						Traits: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    22,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    22,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    22,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Bar"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  19,
 												EndPos:    22,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  18,
+														EndPos:    19,
+													},
+												},
+											},
 										},
 										Value: []byte("Bar"),
 									},
 								},
 							},
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  24,
-										EndPos:    27,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  24,
+									EndPos:    27,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  24,
+											EndPos:    27,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Baz"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  24,
 												EndPos:    27,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  23,
+														EndPos:    24,
+													},
+												},
+											},
 										},
 										Value: []byte("Baz"),
 									},
 								},
 							},
 						},
-						TraitAdaptationList: &ast.StmtNop{
-							Node: ast.Node{
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  22,
+									EndPos:    23,
+								},
+							},
+						},
+						Adaptations: &ast.StmtNop{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  27,
+								EndPos:    28,
+							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -10934,16 +25522,37 @@ func TestStmtTraitUse_Uses(t *testing.T) {
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  29,
+						EndPos:    30,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    29,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10951,115 +25560,304 @@ func TestStmtTraitUse_EmptyAdaptations(t *testing.T) {
 	src := `<? class Foo { use Bar, Baz {} }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    32,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    32,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    32,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    32,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtTraitUse{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    30,
+						},
+						UseTkn: &token.Token{
+							ID:    token.T_USE,
+							Value: []byte("use"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
-								EndPos:    30,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    15,
+									},
+								},
 							},
 						},
 						Traits: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    22,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    22,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    22,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Bar"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  19,
 												EndPos:    22,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  18,
+														EndPos:    19,
+													},
+												},
+											},
 										},
 										Value: []byte("Bar"),
 									},
 								},
 							},
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  24,
-										EndPos:    27,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  24,
+									EndPos:    27,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  24,
+											EndPos:    27,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Baz"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  24,
 												EndPos:    27,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  23,
+														EndPos:    24,
+													},
+												},
+											},
 										},
 										Value: []byte("Baz"),
 									},
 								},
 							},
 						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  22,
+									EndPos:    23,
+								},
+							},
+						},
+						Adaptations: &ast.StmtTraitAdaptationList{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    30,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  28,
+									EndPos:    29,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  27,
+											EndPos:    28,
+										},
+									},
+								},
+							},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  29,
 									EndPos:    30,
 								},
 							},
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  31,
+						EndPos:    32,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    31,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11067,159 +25865,428 @@ func TestStmtTraitUse_Modifier(t *testing.T) {
 	src := `<? class Foo { use Bar, Baz { one as public; } }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    48,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    48,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    48,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    48,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtTraitUse{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    46,
+						},
+						UseTkn: &token.Token{
+							ID:    token.T_USE,
+							Value: []byte("use"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
-								EndPos:    46,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    15,
+									},
+								},
 							},
 						},
 						Traits: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    22,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    22,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    22,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Bar"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  19,
 												EndPos:    22,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  18,
+														EndPos:    19,
+													},
+												},
+											},
 										},
 										Value: []byte("Bar"),
 									},
 								},
 							},
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  24,
-										EndPos:    27,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  24,
+									EndPos:    27,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  24,
+											EndPos:    27,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Baz"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  24,
 												EndPos:    27,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  23,
+														EndPos:    24,
+													},
+												},
+											},
 										},
 										Value: []byte("Baz"),
 									},
 								},
 							},
 						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  22,
+									EndPos:    23,
+								},
+							},
+						},
+						Adaptations: &ast.StmtTraitAdaptationList{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    46,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  28,
-									EndPos:    46,
+									EndPos:    29,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  27,
+											EndPos:    28,
+										},
+									},
 								},
 							},
 							Adaptations: []ast.Vertex{
 								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  30,
+										EndPos:    43,
+									},
+									Ref: &ast.StmtTraitMethodRef{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
-											EndPos:    43,
+											EndPos:    33,
 										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
+										Method: &ast.Identifier{
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  30,
 												EndPos:    33,
 											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
+											IdentifierTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("one"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  30,
 													EndPos:    33,
 												},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 1,
+															EndLine:   1,
+															StartPos:  29,
+															EndPos:    30,
+														},
+													},
+												},
 											},
 											Value: []byte("one"),
 										},
 									},
+									AsTkn: &token.Token{
+										ID:    token.T_AS,
+										Value: []byte("as"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  34,
+											EndPos:    36,
+										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  33,
+													EndPos:    34,
+												},
+											},
+										},
+									},
 									Modifier: &ast.Identifier{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  37,
+											EndPos:    43,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_PUBLIC,
+											Value: []byte("public"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  37,
 												EndPos:    43,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  36,
+														EndPos:    37,
+													},
+												},
+											},
 										},
 										Value: []byte("public"),
 									},
+									SemiColonTkn: &token.Token{
+										ID:    token.ID(59),
+										Value: []byte(";"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  43,
+											EndPos:    44,
+										},
+									},
+								},
+							},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  45,
+									EndPos:    46,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  44,
+											EndPos:    45,
+										},
+									},
 								},
 							},
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  47,
+						EndPos:    48,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  46,
+								EndPos:    47,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11227,170 +26294,459 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) {
 	src := `<? class Foo { use Bar, Baz { one as public two; } }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    52,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    52,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    52,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    52,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtTraitUse{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    50,
+						},
+						UseTkn: &token.Token{
+							ID:    token.T_USE,
+							Value: []byte("use"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
-								EndPos:    50,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    15,
+									},
+								},
 							},
 						},
 						Traits: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    22,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    22,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    22,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Bar"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  19,
 												EndPos:    22,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  18,
+														EndPos:    19,
+													},
+												},
+											},
 										},
 										Value: []byte("Bar"),
 									},
 								},
 							},
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  24,
-										EndPos:    27,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  24,
+									EndPos:    27,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  24,
+											EndPos:    27,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Baz"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  24,
 												EndPos:    27,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  23,
+														EndPos:    24,
+													},
+												},
+											},
 										},
 										Value: []byte("Baz"),
 									},
 								},
 							},
 						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  22,
+									EndPos:    23,
+								},
+							},
+						},
+						Adaptations: &ast.StmtTraitAdaptationList{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    50,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  28,
-									EndPos:    50,
+									EndPos:    29,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  27,
+											EndPos:    28,
+										},
+									},
 								},
 							},
 							Adaptations: []ast.Vertex{
 								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  30,
+										EndPos:    47,
+									},
+									Ref: &ast.StmtTraitMethodRef{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
-											EndPos:    47,
+											EndPos:    33,
 										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
+										Method: &ast.Identifier{
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  30,
 												EndPos:    33,
 											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
+											IdentifierTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("one"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  30,
 													EndPos:    33,
 												},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 1,
+															EndLine:   1,
+															StartPos:  29,
+															EndPos:    30,
+														},
+													},
+												},
 											},
 											Value: []byte("one"),
 										},
 									},
+									AsTkn: &token.Token{
+										ID:    token.T_AS,
+										Value: []byte("as"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  34,
+											EndPos:    36,
+										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  33,
+													EndPos:    34,
+												},
+											},
+										},
+									},
 									Modifier: &ast.Identifier{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  37,
+											EndPos:    43,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_PUBLIC,
+											Value: []byte("public"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  37,
 												EndPos:    43,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  36,
+														EndPos:    37,
+													},
+												},
+											},
 										},
 										Value: []byte("public"),
 									},
 									Alias: &ast.Identifier{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  44,
+											EndPos:    47,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("two"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  44,
 												EndPos:    47,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  43,
+														EndPos:    44,
+													},
+												},
+											},
 										},
 										Value: []byte("two"),
 									},
+									SemiColonTkn: &token.Token{
+										ID:    token.ID(59),
+										Value: []byte(";"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  47,
+											EndPos:    48,
+										},
+									},
+								},
+							},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  49,
+									EndPos:    50,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  48,
+											EndPos:    49,
+										},
+									},
 								},
 							},
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  51,
+						EndPos:    52,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  50,
+								EndPos:    51,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11398,146 +26754,336 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
 	src := `<? class Foo { use Bar, Baz { Bar::one insteadof Baz, Quux; Baz::one as two; } }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    80,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    80,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    80,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    80,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("Foo"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  9,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
 					},
 					Value: []byte("Foo"),
 				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtTraitUse{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    78,
+						},
+						UseTkn: &token.Token{
+							ID:    token.T_USE,
+							Value: []byte("use"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
-								EndPos:    78,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    15,
+									},
+								},
 							},
 						},
 						Traits: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  19,
-										EndPos:    22,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    22,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    22,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Bar"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  19,
 												EndPos:    22,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  18,
+														EndPos:    19,
+													},
+												},
+											},
 										},
 										Value: []byte("Bar"),
 									},
 								},
 							},
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  24,
-										EndPos:    27,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  24,
+									EndPos:    27,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  24,
+											EndPos:    27,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Baz"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  24,
 												EndPos:    27,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  23,
+														EndPos:    24,
+													},
+												},
+											},
 										},
 										Value: []byte("Baz"),
 									},
 								},
 							},
 						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  22,
+									EndPos:    23,
+								},
+							},
+						},
+						Adaptations: &ast.StmtTraitAdaptationList{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  28,
+								EndPos:    78,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  28,
-									EndPos:    78,
+									EndPos:    29,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  27,
+											EndPos:    28,
+										},
+									},
 								},
 							},
 							Adaptations: []ast.Vertex{
 								&ast.StmtTraitUsePrecedence{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  30,
+										EndPos:    58,
+									},
+									Ref: &ast.StmtTraitMethodRef{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
-											EndPos:    58,
+											EndPos:    38,
 										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
+										Trait: &ast.NameName{
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  30,
-												EndPos:    38,
-											},
-										},
-										Trait: &ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  30,
-													EndPos:    33,
-												},
+												EndPos:    33,
 											},
 											Parts: []ast.Vertex{
 												&ast.NameNamePart{
-													Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  30,
+														EndPos:    33,
+													},
+													StringTkn: &token.Token{
+														ID:    token.T_STRING,
+														Value: []byte("Bar"),
 														Position: &position.Position{
 															StartLine: 1,
 															EndLine:   1,
 															StartPos:  30,
 															EndPos:    33,
 														},
+														FreeFloating: []*token.Token{
+															{
+																ID:    token.T_WHITESPACE,
+																Value: []byte(" "),
+																Position: &position.Position{
+																	StartLine: 1,
+																	EndLine:   1,
+																	StartPos:  29,
+																	EndPos:    30,
+																},
+															},
+														},
 													},
 													Value: []byte("Bar"),
 												},
 											},
 										},
+										DoubleColonTkn: &token.Token{
+											ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+											Value: []byte("::"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  33,
+												EndPos:    35,
+											},
+										},
 										Method: &ast.Identifier{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  35,
+												EndPos:    38,
+											},
+											IdentifierTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("one"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
@@ -11548,98 +27094,210 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
 											Value: []byte("one"),
 										},
 									},
-									Insteadof: []ast.Vertex{
-										&ast.NameName{
-											Node: ast.Node{
+									InsteadofTkn: &token.Token{
+										ID:    token.T_INSTEADOF,
+										Value: []byte("insteadof"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  39,
+											EndPos:    48,
+										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
-													StartPos:  49,
-													EndPos:    52,
+													StartPos:  38,
+													EndPos:    39,
 												},
 											},
+										},
+									},
+									Insteadof: []ast.Vertex{
+										&ast.NameName{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  49,
+												EndPos:    52,
+											},
 											Parts: []ast.Vertex{
 												&ast.NameNamePart{
-													Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  49,
+														EndPos:    52,
+													},
+													StringTkn: &token.Token{
+														ID:    token.T_STRING,
+														Value: []byte("Baz"),
 														Position: &position.Position{
 															StartLine: 1,
 															EndLine:   1,
 															StartPos:  49,
 															EndPos:    52,
 														},
+														FreeFloating: []*token.Token{
+															{
+																ID:    token.T_WHITESPACE,
+																Value: []byte(" "),
+																Position: &position.Position{
+																	StartLine: 1,
+																	EndLine:   1,
+																	StartPos:  48,
+																	EndPos:    49,
+																},
+															},
+														},
 													},
 													Value: []byte("Baz"),
 												},
 											},
 										},
 										&ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  54,
-													EndPos:    58,
-												},
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  54,
+												EndPos:    58,
 											},
 											Parts: []ast.Vertex{
 												&ast.NameNamePart{
-													Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  54,
+														EndPos:    58,
+													},
+													StringTkn: &token.Token{
+														ID:    token.T_STRING,
+														Value: []byte("Quux"),
 														Position: &position.Position{
 															StartLine: 1,
 															EndLine:   1,
 															StartPos:  54,
 															EndPos:    58,
 														},
+														FreeFloating: []*token.Token{
+															{
+																ID:    token.T_WHITESPACE,
+																Value: []byte(" "),
+																Position: &position.Position{
+																	StartLine: 1,
+																	EndLine:   1,
+																	StartPos:  53,
+																	EndPos:    54,
+																},
+															},
+														},
 													},
 													Value: []byte("Quux"),
 												},
 											},
 										},
 									},
+									SeparatorTkns: []*token.Token{
+										{
+											ID:    token.ID(44),
+											Value: []byte(","),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  52,
+												EndPos:    53,
+											},
+										},
+									},
+									SemiColonTkn: &token.Token{
+										ID:    token.ID(59),
+										Value: []byte(";"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  58,
+											EndPos:    59,
+										},
+									},
 								},
 								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  60,
+										EndPos:    75,
+									},
+									Ref: &ast.StmtTraitMethodRef{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  60,
-											EndPos:    75,
+											EndPos:    68,
 										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
+										Trait: &ast.NameName{
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  60,
-												EndPos:    68,
-											},
-										},
-										Trait: &ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  60,
-													EndPos:    63,
-												},
+												EndPos:    63,
 											},
 											Parts: []ast.Vertex{
 												&ast.NameNamePart{
-													Node: ast.Node{
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  60,
+														EndPos:    63,
+													},
+													StringTkn: &token.Token{
+														ID:    token.T_STRING,
+														Value: []byte("Baz"),
 														Position: &position.Position{
 															StartLine: 1,
 															EndLine:   1,
 															StartPos:  60,
 															EndPos:    63,
 														},
+														FreeFloating: []*token.Token{
+															{
+																ID:    token.T_WHITESPACE,
+																Value: []byte(" "),
+																Position: &position.Position{
+																	StartLine: 1,
+																	EndLine:   1,
+																	StartPos:  59,
+																	EndPos:    60,
+																},
+															},
+														},
 													},
 													Value: []byte("Baz"),
 												},
 											},
 										},
+										DoubleColonTkn: &token.Token{
+											ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+											Value: []byte("::"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  63,
+												EndPos:    65,
+											},
+										},
 										Method: &ast.Identifier{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  65,
+												EndPos:    68,
+											},
+											IdentifierTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("one"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
@@ -11650,127 +27308,402 @@ func TestStmtTraitUse_Adaptions(t *testing.T) {
 											Value: []byte("one"),
 										},
 									},
+									AsTkn: &token.Token{
+										ID:    token.T_AS,
+										Value: []byte("as"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  69,
+											EndPos:    71,
+										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  68,
+													EndPos:    69,
+												},
+											},
+										},
+									},
 									Alias: &ast.Identifier{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  72,
+											EndPos:    75,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("two"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  72,
 												EndPos:    75,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  71,
+														EndPos:    72,
+													},
+												},
+											},
 										},
 										Value: []byte("two"),
 									},
+									SemiColonTkn: &token.Token{
+										ID:    token.ID(59),
+										Value: []byte(";"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  75,
+											EndPos:    76,
+										},
+									},
+								},
+							},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  77,
+									EndPos:    78,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  76,
+											EndPos:    77,
+										},
+									},
 								},
 							},
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  79,
+						EndPos:    80,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  78,
+								EndPos:    79,
+							},
+						},
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestStmtTry_Try(t *testing.T) {
-	src := `<? 
+	src := `<?
 		try {}
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   -1,
-				StartPos:  6,
-				EndPos:    -1,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   -1,
+			StartPos:  5,
+			EndPos:    -1,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtTry{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   -1,
+					StartPos:  5,
+					EndPos:    -1,
+				},
+				TryTkn: &token.Token{
+					ID:    token.T_TRY,
+					Value: []byte("try"),
 					Position: &position.Position{
 						StartLine: 2,
-						EndLine:   -1,
-						StartPos:  6,
-						EndPos:    -1,
+						EndLine:   2,
+						StartPos:  5,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  10,
+						EndPos:    11,
 					},
 				},
-				Stmts:   []ast.Vertex{},
 				Catches: []ast.Vertex{},
 			},
 		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   3,
+						StartPos:  11,
+						EndPos:    13,
+					},
+				},
+			},
+		},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestStmtTry_TryCatch(t *testing.T) {
-	src := `<? 
+	src := `<?
 		try {} catch (Exception $e) {}
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   2,
-				StartPos:  6,
-				EndPos:    36,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   2,
+			StartPos:  5,
+			EndPos:    35,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtTry{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    35,
+				},
+				TryTkn: &token.Token{
+					ID:    token.T_TRY,
+					Value: []byte("try"),
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  6,
-						EndPos:    36,
+						StartPos:  5,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
 					},
 				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  13,
-								EndPos:    36,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
+				Catches: []ast.Vertex{
+					&ast.StmtCatch{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  12,
+							EndPos:    35,
+						},
+						CatchTkn: &token.Token{
+							ID:    token.T_CATCH,
+							Value: []byte("catch"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    17,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  11,
+										EndPos:    12,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  18,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
 							},
 						},
 						Types: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  20,
-										EndPos:    29,
-									},
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  19,
+									EndPos:    28,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  19,
+											EndPos:    28,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Exception"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  20,
-												EndPos:    29,
+												StartPos:  19,
+												EndPos:    28,
 											},
 										},
 										Value: []byte("Exception"),
@@ -11779,27 +27712,101 @@ func TestStmtTry_TryCatch(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  29,
+								EndPos:    31,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  30,
-									EndPos:    32,
+									StartPos:  29,
+									EndPos:    31,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$e"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  30,
-										EndPos:    32,
+										StartPos:  29,
+										EndPos:    31,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  28,
+												EndPos:    29,
+											},
+										},
 									},
 								},
 								Value: []byte("$e"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  31,
+								EndPos:    32,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  33,
+								EndPos:    34,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  32,
+										EndPos:    33,
+									},
+								},
+							},
+						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  34,
+								EndPos:    35,
+							},
+						},
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   3,
+						StartPos:  35,
+						EndPos:    37,
 					},
 				},
 			},
@@ -11810,64 +27817,170 @@ func TestStmtTry_TryCatch(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestStmtTry_Php7TryCatch(t *testing.T) {
-	src := `<? 
+	src := `<?
 		try {} catch (Exception|RuntimeException $e) {}
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   2,
-				StartPos:  6,
-				EndPos:    53,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   2,
+			StartPos:  5,
+			EndPos:    52,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtTry{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    52,
+				},
+				TryTkn: &token.Token{
+					ID:    token.T_TRY,
+					Value: []byte("try"),
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  6,
-						EndPos:    53,
+						StartPos:  5,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
 					},
 				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  13,
-								EndPos:    53,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
+				Catches: []ast.Vertex{
+					&ast.StmtCatch{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  12,
+							EndPos:    52,
+						},
+						CatchTkn: &token.Token{
+							ID:    token.T_CATCH,
+							Value: []byte("catch"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    17,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  11,
+										EndPos:    12,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  18,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
 							},
 						},
 						Types: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  20,
-										EndPos:    29,
-									},
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  19,
+									EndPos:    28,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  19,
+											EndPos:    28,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Exception"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  20,
-												EndPos:    29,
+												StartPos:  19,
+												EndPos:    28,
 											},
 										},
 										Value: []byte("Exception"),
@@ -11875,22 +27988,28 @@ func TestStmtTry_Php7TryCatch(t *testing.T) {
 								},
 							},
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  30,
-										EndPos:    46,
-									},
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  29,
+									EndPos:    45,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  29,
+											EndPos:    45,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("RuntimeException"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  30,
-												EndPos:    46,
+												StartPos:  29,
+												EndPos:    45,
 											},
 										},
 										Value: []byte("RuntimeException"),
@@ -11898,28 +28017,114 @@ func TestStmtTry_Php7TryCatch(t *testing.T) {
 								},
 							},
 						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(124),
+								Value: []byte("|"),
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  47,
-									EndPos:    49,
+									StartPos:  28,
+									EndPos:    29,
 								},
 							},
+						},
+						Var: &ast.ExprVariable{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  46,
+								EndPos:    48,
+							},
 							VarName: &ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  46,
+									EndPos:    48,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$e"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  47,
-										EndPos:    49,
+										StartPos:  46,
+										EndPos:    48,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  45,
+												EndPos:    46,
+											},
+										},
 									},
 								},
 								Value: []byte("$e"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  48,
+								EndPos:    49,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  50,
+								EndPos:    51,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  49,
+										EndPos:    50,
+									},
+								},
+							},
+						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  51,
+								EndPos:    52,
+							},
+						},
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   3,
+						StartPos:  52,
+						EndPos:    54,
 					},
 				},
 			},
@@ -11930,64 +28135,170 @@ func TestStmtTry_Php7TryCatch(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestStmtTry_TryCatchCatch(t *testing.T) {
-	src := `<? 
+	src := `<?
 		try {} catch (Exception $e) {} catch (RuntimeException $e) {}
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   2,
-				StartPos:  6,
-				EndPos:    67,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   2,
+			StartPos:  5,
+			EndPos:    66,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtTry{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    66,
+				},
+				TryTkn: &token.Token{
+					ID:    token.T_TRY,
+					Value: []byte("try"),
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  6,
-						EndPos:    67,
+						StartPos:  5,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
 					},
 				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  13,
-								EndPos:    36,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
+				Catches: []ast.Vertex{
+					&ast.StmtCatch{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  12,
+							EndPos:    35,
+						},
+						CatchTkn: &token.Token{
+							ID:    token.T_CATCH,
+							Value: []byte("catch"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    17,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  11,
+										EndPos:    12,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  18,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
 							},
 						},
 						Types: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  20,
-										EndPos:    29,
-									},
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  19,
+									EndPos:    28,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  19,
+											EndPos:    28,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Exception"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  20,
-												EndPos:    29,
+												StartPos:  19,
+												EndPos:    28,
 											},
 										},
 										Value: []byte("Exception"),
@@ -11996,55 +28307,163 @@ func TestStmtTry_TryCatchCatch(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  29,
+								EndPos:    31,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  30,
-									EndPos:    32,
+									StartPos:  29,
+									EndPos:    31,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$e"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  30,
-										EndPos:    32,
+										StartPos:  29,
+										EndPos:    31,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  28,
+												EndPos:    29,
+											},
+										},
 									},
 								},
 								Value: []byte("$e"),
 							},
 						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCatch{
-						Node: ast.Node{
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  37,
-								EndPos:    67,
+								StartPos:  31,
+								EndPos:    32,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  33,
+								EndPos:    34,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  32,
+										EndPos:    33,
+									},
+								},
+							},
+						},
+						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  34,
+								EndPos:    35,
+							},
+						},
+					},
+					&ast.StmtCatch{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  36,
+							EndPos:    66,
+						},
+						CatchTkn: &token.Token{
+							ID:    token.T_CATCH,
+							Value: []byte("catch"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  36,
+								EndPos:    41,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  35,
+										EndPos:    36,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  42,
+								EndPos:    43,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  41,
+										EndPos:    42,
+									},
+								},
 							},
 						},
 						Types: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  44,
-										EndPos:    60,
-									},
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  43,
+									EndPos:    59,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  43,
+											EndPos:    59,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("RuntimeException"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  44,
-												EndPos:    60,
+												StartPos:  43,
+												EndPos:    59,
 											},
 										},
 										Value: []byte("RuntimeException"),
@@ -12053,27 +28472,101 @@ func TestStmtTry_TryCatchCatch(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  60,
+								EndPos:    62,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  61,
-									EndPos:    63,
+									StartPos:  60,
+									EndPos:    62,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$e"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  61,
-										EndPos:    63,
+										StartPos:  60,
+										EndPos:    62,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  59,
+												EndPos:    60,
+											},
+										},
 									},
 								},
 								Value: []byte("$e"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  62,
+								EndPos:    63,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  64,
+								EndPos:    65,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  63,
+										EndPos:    64,
+									},
+								},
+							},
+						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  65,
+								EndPos:    66,
+							},
+						},
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   3,
+						StartPos:  66,
+						EndPos:    68,
 					},
 				},
 			},
@@ -12084,64 +28577,170 @@ func TestStmtTry_TryCatchCatch(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestStmtTry_TryCatchFinally(t *testing.T) {
-	src := `<? 
+	src := `<?
 		try {} catch (Exception $e) {} finally {}
 	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   2,
-				StartPos:  6,
-				EndPos:    47,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   2,
+			StartPos:  5,
+			EndPos:    46,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtTry{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    46,
+				},
+				TryTkn: &token.Token{
+					ID:    token.T_TRY,
+					Value: []byte("try"),
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
-						StartPos:  6,
-						EndPos:    47,
+						StartPos:  5,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   2,
+								StartPos:  2,
+								EndPos:    5,
+							},
+						},
 					},
 				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
-								StartPos:  13,
-								EndPos:    36,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+				},
+				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
+				Catches: []ast.Vertex{
+					&ast.StmtCatch{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  12,
+							EndPos:    35,
+						},
+						CatchTkn: &token.Token{
+							ID:    token.T_CATCH,
+							Value: []byte("catch"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  12,
+								EndPos:    17,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  11,
+										EndPos:    12,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  18,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
 							},
 						},
 						Types: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  20,
-										EndPos:    29,
-									},
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  19,
+									EndPos:    28,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  19,
+											EndPos:    28,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Exception"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
-												StartPos:  20,
-												EndPos:    29,
+												StartPos:  19,
+												EndPos:    28,
 											},
 										},
 										Value: []byte("Exception"),
@@ -12150,39 +28749,165 @@ func TestStmtTry_TryCatchFinally(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  29,
+								EndPos:    31,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
-									StartPos:  30,
-									EndPos:    32,
+									StartPos:  29,
+									EndPos:    31,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$e"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  30,
-										EndPos:    32,
+										StartPos:  29,
+										EndPos:    31,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  28,
+												EndPos:    29,
+											},
+										},
 									},
 								},
 								Value: []byte("$e"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  31,
+								EndPos:    32,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  33,
+								EndPos:    34,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  32,
+										EndPos:    33,
+									},
+								},
+							},
+						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  34,
+								EndPos:    35,
+							},
+						},
 					},
 				},
 				Finally: &ast.StmtFinally{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  36,
+						EndPos:    46,
+					},
+					FinallyTkn: &token.Token{
+						ID:    token.T_FINALLY,
+						Value: []byte("finally"),
 						Position: &position.Position{
 							StartLine: 2,
 							EndLine:   2,
-							StartPos:  37,
-							EndPos:    47,
+							StartPos:  36,
+							EndPos:    43,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  35,
+									EndPos:    36,
+								},
+							},
+						},
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  44,
+							EndPos:    45,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  43,
+									EndPos:    44,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  45,
+							EndPos:    46,
+						},
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   3,
+						StartPos:  46,
+						EndPos:    48,
+					},
 				},
 			},
 		},
@@ -12192,8 +28917,6 @@ func TestStmtTry_TryCatchFinally(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12201,48 +28924,156 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) {
 	src := `<? try {} catch (Exception $e) {} catch (\RuntimeException $e) {} catch (namespace\AdditionException $e) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    107,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    107,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtTry{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    107,
+				},
+				TryTkn: &token.Token{
+					ID:    token.T_TRY,
+					Value: []byte("try"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    107,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  6,
+								EndPos:    7,
+							},
+						},
 					},
 				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
+					},
+				},
 				Catches: []ast.Vertex{
 					&ast.StmtCatch{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    33,
+						},
+						CatchTkn: &token.Token{
+							ID:    token.T_CATCH,
+							Value: []byte("catch"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  10,
-								EndPos:    33,
+								EndPos:    15,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  9,
+										EndPos:    10,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  15,
+										EndPos:    16,
+									},
+								},
 							},
 						},
 						Types: []ast.Vertex{
 							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  17,
-										EndPos:    26,
-									},
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  17,
+									EndPos:    26,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  17,
+											EndPos:    26,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("Exception"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -12256,50 +29087,168 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  27,
+								EndPos:    29,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  27,
 									EndPos:    29,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$e"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  27,
 										EndPos:    29,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  26,
+												EndPos:    27,
+											},
+										},
+									},
 								},
 								Value: []byte("$e"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  29,
+								EndPos:    30,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  31,
+								EndPos:    32,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  30,
+										EndPos:    31,
+									},
+								},
+							},
+						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  32,
+								EndPos:    33,
+							},
+						},
 					},
 					&ast.StmtCatch{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  34,
+							EndPos:    65,
+						},
+						CatchTkn: &token.Token{
+							ID:    token.T_CATCH,
+							Value: []byte("catch"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  34,
-								EndPos:    65,
+								EndPos:    39,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  33,
+										EndPos:    34,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  40,
+								EndPos:    41,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  39,
+										EndPos:    40,
+									},
+								},
 							},
 						},
 						Types: []ast.Vertex{
 							&ast.NameFullyQualified{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  41,
+									EndPos:    58,
+								},
+								NsSeparatorTkn: &token.Token{
+									ID:    token.T_NS_SEPARATOR,
+									Value: []byte("\\"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  41,
-										EndPos:    58,
+										EndPos:    42,
 									},
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  42,
+											EndPos:    58,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("RuntimeException"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -12313,50 +29262,178 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  59,
+								EndPos:    61,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  59,
 									EndPos:    61,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$e"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  59,
 										EndPos:    61,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  58,
+												EndPos:    59,
+											},
+										},
+									},
 								},
 								Value: []byte("$e"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  61,
+								EndPos:    62,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  63,
+								EndPos:    64,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  62,
+										EndPos:    63,
+									},
+								},
+							},
+						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  64,
+								EndPos:    65,
+							},
+						},
 					},
 					&ast.StmtCatch{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  66,
+							EndPos:    107,
+						},
+						CatchTkn: &token.Token{
+							ID:    token.T_CATCH,
+							Value: []byte("catch"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  66,
-								EndPos:    107,
+								EndPos:    71,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  65,
+										EndPos:    66,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  72,
+								EndPos:    73,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  71,
+										EndPos:    72,
+									},
+								},
 							},
 						},
 						Types: []ast.Vertex{
 							&ast.NameRelative{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  73,
+									EndPos:    100,
+								},
+								NsTkn: &token.Token{
+									ID:    token.T_NAMESPACE,
+									Value: []byte("namespace"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  73,
-										EndPos:    100,
+										EndPos:    82,
+									},
+								},
+								NsSeparatorTkn: &token.Token{
+									ID:    token.T_NS_SEPARATOR,
+									Value: []byte("\\"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  82,
+										EndPos:    83,
 									},
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  83,
+											EndPos:    100,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("AdditionException"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -12370,39 +29447,98 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  101,
+								EndPos:    103,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  101,
 									EndPos:    103,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$e"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  101,
 										EndPos:    103,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  100,
+												EndPos:    101,
+											},
+										},
+									},
 								},
 								Value: []byte("$e"),
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  103,
+								EndPos:    104,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  105,
+								EndPos:    106,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  104,
+										EndPos:    105,
+									},
+								},
+							},
+						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  106,
+								EndPos:    107,
+							},
+						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12410,36 +29546,80 @@ func TestStmtUnset(t *testing.T) {
 	src := `<? unset($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUnset{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				UnsetTkn: &token.Token{
+					ID:    token.T_UNSET,
+					Value: []byte("unset"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
 					},
 				},
 				Vars: []ast.Vertex{
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -12451,16 +29631,35 @@ func TestStmtUnset(t *testing.T) {
 						},
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12468,36 +29667,80 @@ func TestStmtUnset_Vars(t *testing.T) {
 	src := `<? unset($a, $b);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUnset{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				UnsetTkn: &token.Token{
+					ID:    token.T_UNSET,
+					Value: []byte("unset"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
 					},
 				},
 				Vars: []ast.Vertex{
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -12509,37 +29752,86 @@ func TestStmtUnset_Vars(t *testing.T) {
 						},
 					},
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    15,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
 								EndPos:    15,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    15,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  12,
+											EndPos:    13,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12547,36 +29839,80 @@ func TestStmtUnset_TrailingComma(t *testing.T) {
 	src := `<? unset($a, $b,);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    18,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    18,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUnset{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    18,
+				},
+				UnsetTkn: &token.Token{
+					ID:    token.T_UNSET,
+					Value: []byte("unset"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    18,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
 					},
 				},
 				Vars: []ast.Vertex{
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -12588,37 +29924,96 @@ func TestStmtUnset_TrailingComma(t *testing.T) {
 						},
 					},
 					&ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    15,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
 								EndPos:    15,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    15,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  12,
+											EndPos:    13,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    16,
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12626,52 +30021,96 @@ func TestStmtUse(t *testing.T) {
 	src := `<? use Foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    11,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    11,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    11,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    10,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
 								EndPos:    10,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  7,
-									EndPos:    10,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  7,
 											EndPos:    10,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  6,
+													EndPos:    7,
+												},
+											},
+										},
 									},
 									Value: []byte("Foo"),
 								},
@@ -12679,16 +30118,25 @@ func TestStmtUse(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12696,46 +30144,100 @@ func TestStmtUse_FullyQualified(t *testing.T) {
 	src := `<? use \Foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    11,
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
-								EndPos:    11,
+								EndPos:    8,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  6,
+										EndPos:    7,
+									},
+								},
 							},
 						},
 						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    11,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    11,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    11,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -12749,16 +30251,25 @@ func TestStmtUse_FullyQualified(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12766,46 +30277,100 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) {
 	src := `<? use \Foo as Bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    18,
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
-								EndPos:    18,
+								EndPos:    8,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  6,
+										EndPos:    7,
+									},
+								},
 							},
 						},
 						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    11,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    11,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    11,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -12817,29 +30382,80 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) {
 								},
 							},
 						},
+						AsTkn: &token.Token{
+							ID:    token.T_AS,
+							Value: []byte("as"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    14,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  11,
+										EndPos:    12,
+									},
+								},
+							},
+						},
 						Alias: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    18,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
 									EndPos:    18,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
+								},
 							},
 							Value: []byte("Bar"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12847,52 +30463,96 @@ func TestStmtUse_List(t *testing.T) {
 	src := `<? use Foo, Bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    16,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    16,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    16,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    16,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    10,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
 								EndPos:    10,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  7,
-									EndPos:    10,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  7,
 											EndPos:    10,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  6,
+													EndPos:    7,
+												},
+											},
+										},
 									},
 									Value: []byte("Foo"),
 								},
@@ -12900,32 +30560,48 @@ func TestStmtUse_List(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    15,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
 								EndPos:    15,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    15,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  12,
 											EndPos:    15,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  11,
+													EndPos:    12,
+												},
+											},
+										},
 									},
 									Value: []byte("Bar"),
 								},
@@ -12933,16 +30609,37 @@ func TestStmtUse_List(t *testing.T) {
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12950,52 +30647,96 @@ func TestStmtUse_ListAlias(t *testing.T) {
 	src := `<? use Foo, Bar as Baz;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    10,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
 								EndPos:    10,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  7,
-									EndPos:    10,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  7,
+										EndPos:    10,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  7,
 											EndPos:    10,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  6,
+													EndPos:    7,
+												},
+											},
+										},
 									},
 									Value: []byte("Foo"),
 								},
@@ -13003,60 +30744,139 @@ func TestStmtUse_ListAlias(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    22,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
-								EndPos:    22,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    15,
-								},
+								EndPos:    15,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  12,
 											EndPos:    15,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  11,
+													EndPos:    12,
+												},
+											},
+										},
 									},
 									Value: []byte("Bar"),
 								},
 							},
 						},
+						AsTkn: &token.Token{
+							ID:    token.T_AS,
+							Value: []byte("as"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  15,
+										EndPos:    16,
+									},
+								},
+							},
+						},
 						Alias: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  19,
+								EndPos:    22,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Baz"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  19,
 									EndPos:    22,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  18,
+											EndPos:    19,
+										},
+									},
+								},
 							},
 							Value: []byte("Baz"),
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13064,63 +30884,127 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 	src := `<? use function Foo, \Bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    26,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    26,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    26,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Type: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    15,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    15,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  6,
+									EndPos:    7,
+								},
+							},
+						},
 					},
 					Value: []byte("function"),
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    19,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
 								EndPos:    19,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  16,
-									EndPos:    19,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    19,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  16,
 											EndPos:    19,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  15,
+													EndPos:    16,
+												},
+											},
+										},
 									},
 									Value: []byte("Foo"),
 								},
@@ -13128,26 +31012,52 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    25,
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  21,
-								EndPos:    25,
+								EndPos:    22,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  20,
+										EndPos:    21,
+									},
+								},
 							},
 						},
 						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  22,
-									EndPos:    25,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  22,
+								EndPos:    25,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  22,
+										EndPos:    25,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -13161,16 +31071,37 @@ func TestStmtUse_ListFunctionType(t *testing.T) {
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  19,
+							EndPos:    20,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  25,
+						EndPos:    26,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13178,101 +31109,233 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 	src := `<? use function Foo as foo, \Bar as bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    40,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    40,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    40,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    40,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Type: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    15,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    15,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  6,
+									EndPos:    7,
+								},
+							},
+						},
 					},
 					Value: []byte("function"),
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    26,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
-								EndPos:    26,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  16,
-									EndPos:    19,
-								},
+								EndPos:    19,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    19,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  16,
 											EndPos:    19,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  15,
+													EndPos:    16,
+												},
+											},
+										},
 									},
 									Value: []byte("Foo"),
 								},
 							},
 						},
+						AsTkn: &token.Token{
+							ID:    token.T_AS,
+							Value: []byte("as"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    22,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    20,
+									},
+								},
+							},
+						},
 						Alias: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  23,
+								EndPos:    26,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  23,
 									EndPos:    26,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  22,
+											EndPos:    23,
+										},
+									},
+								},
 							},
 							Value: []byte("foo"),
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  28,
+							EndPos:    39,
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  28,
-								EndPos:    39,
+								EndPos:    29,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  27,
+										EndPos:    28,
+									},
+								},
 							},
 						},
 						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  29,
-									EndPos:    32,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  29,
+								EndPos:    32,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  29,
+										EndPos:    32,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -13284,29 +31347,92 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) {
 								},
 							},
 						},
+						AsTkn: &token.Token{
+							ID:    token.T_AS,
+							Value: []byte("as"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  33,
+								EndPos:    35,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  32,
+										EndPos:    33,
+									},
+								},
+							},
+						},
 						Alias: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  36,
+								EndPos:    39,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  36,
 									EndPos:    39,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  35,
+											EndPos:    36,
+										},
+									},
+								},
 							},
 							Value: []byte("bar"),
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  26,
+							EndPos:    27,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  39,
+						EndPos:    40,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13314,63 +31440,127 @@ func TestStmtUse_ListConstType(t *testing.T) {
 	src := `<? use const Foo, \Bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Type: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_CONST,
+						Value: []byte("const"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  6,
+									EndPos:    7,
+								},
+							},
+						},
 					},
 					Value: []byte("const"),
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    16,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
 								EndPos:    16,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  13,
-									EndPos:    16,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    16,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  13,
 											EndPos:    16,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  12,
+													EndPos:    13,
+												},
+											},
+										},
 									},
 									Value: []byte("Foo"),
 								},
@@ -13378,26 +31568,52 @@ func TestStmtUse_ListConstType(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    22,
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
-								EndPos:    22,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
 							},
 						},
 						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  19,
-									EndPos:    22,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  19,
+								EndPos:    22,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    22,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -13411,16 +31627,37 @@ func TestStmtUse_ListConstType(t *testing.T) {
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    17,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13428,101 +31665,233 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 	src := `<? use const Foo as foo, \Bar as bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    37,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    37,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    37,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    37,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Type: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_CONST,
+						Value: []byte("const"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  6,
+									EndPos:    7,
+								},
+							},
+						},
 					},
 					Value: []byte("const"),
 				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    23,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
-								EndPos:    23,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  13,
-									EndPos:    16,
-								},
+								EndPos:    16,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    16,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  13,
 											EndPos:    16,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  12,
+													EndPos:    13,
+												},
+											},
+										},
 									},
 									Value: []byte("Foo"),
 								},
 							},
 						},
+						AsTkn: &token.Token{
+							ID:    token.T_AS,
+							Value: []byte("as"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  17,
+								EndPos:    19,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    17,
+									},
+								},
+							},
+						},
 						Alias: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    23,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  20,
 									EndPos:    23,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    20,
+										},
+									},
+								},
 							},
 							Value: []byte("foo"),
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  25,
+							EndPos:    36,
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  25,
-								EndPos:    36,
+								EndPos:    26,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  24,
+										EndPos:    25,
+									},
+								},
 							},
 						},
 						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  26,
-									EndPos:    29,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  26,
+								EndPos:    29,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  26,
+										EndPos:    29,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -13534,29 +31903,92 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) {
 								},
 							},
 						},
+						AsTkn: &token.Token{
+							ID:    token.T_AS,
+							Value: []byte("as"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    32,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  29,
+										EndPos:    30,
+									},
+								},
+							},
+						},
 						Alias: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  33,
+								EndPos:    36,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  33,
 									EndPos:    36,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  32,
+											EndPos:    33,
+										},
+									},
+								},
 							},
 							Value: []byte("bar"),
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    24,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  36,
+						EndPos:    37,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13564,69 +31996,139 @@ func TestStmtUse_GroupUse(t *testing.T) {
 	src := `<? use Foo\{Bar, Baz};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    22,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    22,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtGroupUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    22,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    22,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  7,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    10,
 					},
 					Parts: []ast.Vertex{
 						&ast.NameNamePart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    10,
+							},
+							StringTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  7,
 									EndPos:    10,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  6,
+											EndPos:    7,
+										},
+									},
+								},
 							},
 							Value: []byte("Foo"),
 						},
 					},
 				},
+				NsSeparatorTkn: &token.Token{
+					ID:    token.T_NS_SEPARATOR,
+					Value: []byte("\\"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    15,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
 								EndPos:    15,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    15,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -13640,32 +32142,48 @@ func TestStmtUse_GroupUse(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  17,
+							EndPos:    20,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  17,
 								EndPos:    20,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  17,
-									EndPos:    20,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    20,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Baz"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  17,
 											EndPos:    20,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  16,
+													EndPos:    17,
+												},
+											},
+										},
 									},
 									Value: []byte("Baz"),
 								},
@@ -13673,16 +32191,47 @@ func TestStmtUse_GroupUse(t *testing.T) {
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    16,
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    22,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13690,69 +32239,139 @@ func TestStmtUse_GroupUseAlias(t *testing.T) {
 	src := `<? use Foo\{Bar, Baz as quux};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    30,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    30,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtGroupUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    30,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    30,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  7,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    10,
 					},
 					Parts: []ast.Vertex{
 						&ast.NameNamePart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    10,
+							},
+							StringTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  7,
 									EndPos:    10,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  6,
+											EndPos:    7,
+										},
+									},
+								},
 							},
 							Value: []byte("Foo"),
 						},
 					},
 				},
+				NsSeparatorTkn: &token.Token{
+					ID:    token.T_NS_SEPARATOR,
+					Value: []byte("\\"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    15,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
 								EndPos:    15,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    15,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    15,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -13766,60 +32385,149 @@ func TestStmtUse_GroupUseAlias(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  17,
+							EndPos:    28,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  17,
-								EndPos:    28,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  17,
-									EndPos:    20,
-								},
+								EndPos:    20,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    20,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Baz"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  17,
 											EndPos:    20,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  16,
+													EndPos:    17,
+												},
+											},
+										},
 									},
 									Value: []byte("Baz"),
 								},
 							},
 						},
+						AsTkn: &token.Token{
+							ID:    token.T_AS,
+							Value: []byte("as"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  21,
+								EndPos:    23,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  20,
+										EndPos:    21,
+									},
+								},
+							},
+						},
 						Alias: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    28,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("quux"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  24,
 									EndPos:    28,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  23,
+											EndPos:    24,
+										},
+									},
+								},
 							},
 							Value: []byte("quux"),
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    16,
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  28,
+						EndPos:    29,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  29,
+						EndPos:    30,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13827,80 +32535,170 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) {
 	src := `<? use function Foo\{Bar, Baz};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    31,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    31,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtGroupUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    31,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    31,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Type: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    15,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    15,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  6,
+									EndPos:    7,
+								},
+							},
+						},
 					},
 					Value: []byte("function"),
 				},
 				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  16,
-							EndPos:    19,
-						},
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    19,
 					},
 					Parts: []ast.Vertex{
 						&ast.NameNamePart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    19,
+							},
+							StringTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  16,
 									EndPos:    19,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  15,
+											EndPos:    16,
+										},
+									},
+								},
 							},
 							Value: []byte("Foo"),
 						},
 					},
 				},
+				NsSeparatorTkn: &token.Token{
+					ID:    token.T_NS_SEPARATOR,
+					Value: []byte("\\"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  19,
+						EndPos:    20,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    24,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  21,
 								EndPos:    24,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  21,
-									EndPos:    24,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  21,
+										EndPos:    24,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -13914,32 +32712,48 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  26,
+							EndPos:    29,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  26,
 								EndPos:    29,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  26,
-									EndPos:    29,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  26,
+										EndPos:    29,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Baz"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  26,
 											EndPos:    29,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  25,
+													EndPos:    26,
+												},
+											},
+										},
 									},
 									Value: []byte("Baz"),
 								},
@@ -13947,16 +32761,47 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) {
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  24,
+							EndPos:    25,
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  29,
+						EndPos:    30,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  30,
+						EndPos:    31,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13964,80 +32809,170 @@ func TestStmtUse_ConstGroupUse(t *testing.T) {
 	src := `<? use const Foo\{Bar, Baz};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    28,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    28,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtGroupUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    28,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    28,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Type: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    12,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_CONST,
+						Value: []byte("const"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  7,
 							EndPos:    12,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  6,
+									EndPos:    7,
+								},
+							},
+						},
 					},
 					Value: []byte("const"),
 				},
 				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  13,
-							EndPos:    16,
-						},
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    16,
 					},
 					Parts: []ast.Vertex{
 						&ast.NameNamePart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    16,
+							},
+							StringTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  12,
+											EndPos:    13,
+										},
+									},
+								},
 							},
 							Value: []byte("Foo"),
 						},
 					},
 				},
+				NsSeparatorTkn: &token.Token{
+					ID:    token.T_NS_SEPARATOR,
+					Value: []byte("\\"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    21,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    21,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  18,
-									EndPos:    21,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  18,
+										EndPos:    21,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -14051,32 +32986,48 @@ func TestStmtUse_ConstGroupUse(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    26,
+						},
+						Use: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  23,
 								EndPos:    26,
 							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  23,
-									EndPos:    26,
-								},
-							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  23,
+										EndPos:    26,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Baz"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  23,
 											EndPos:    26,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  22,
+													EndPos:    23,
+												},
+											},
+										},
 									},
 									Value: []byte("Baz"),
 								},
@@ -14084,16 +33035,47 @@ func TestStmtUse_ConstGroupUse(t *testing.T) {
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    22,
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  26,
+						EndPos:    27,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  27,
+						EndPos:    28,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14101,59 +33083,131 @@ func TestStmtUse_MixedGroupUse(t *testing.T) {
 	src := `<? use Foo\{const Bar, function Baz};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    37,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    37,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtGroupUse{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    37,
+				},
+				UseTkn: &token.Token{
+					ID:    token.T_USE,
+					Value: []byte("use"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    37,
+						EndPos:    6,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
 					},
 				},
 				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  7,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    10,
 					},
 					Parts: []ast.Vertex{
 						&ast.NameNamePart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    10,
+							},
+							StringTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("Foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  7,
 									EndPos:    10,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  6,
+											EndPos:    7,
+										},
+									},
+								},
 							},
 							Value: []byte("Foo"),
 						},
 					},
 				},
+				NsSeparatorTkn: &token.Token{
+					ID:    token.T_NS_SEPARATOR,
+					Value: []byte("\\"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 				UseDeclarations: []ast.Vertex{
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    21,
+						},
+						Type: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
-								EndPos:    21,
+								EndPos:    17,
 							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_CONST,
+								Value: []byte("const"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -14164,23 +33218,41 @@ func TestStmtUse_MixedGroupUse(t *testing.T) {
 							Value: []byte("const"),
 						},
 						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  18,
-									EndPos:    21,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  18,
+								EndPos:    21,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  18,
+										EndPos:    21,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Bar"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  18,
 											EndPos:    21,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  17,
+													EndPos:    18,
+												},
+											},
+										},
 									},
 									Value: []byte("Bar"),
 								},
@@ -14188,43 +33260,79 @@ func TestStmtUse_MixedGroupUse(t *testing.T) {
 						},
 					},
 					&ast.StmtUseDeclaration{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    35,
+						},
+						Type: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  23,
-								EndPos:    35,
+								EndPos:    31,
 							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_FUNCTION,
+								Value: []byte("function"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  23,
 									EndPos:    31,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  22,
+											EndPos:    23,
+										},
+									},
+								},
 							},
 							Value: []byte("function"),
 						},
 						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  32,
-									EndPos:    35,
-								},
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  32,
+								EndPos:    35,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  32,
+										EndPos:    35,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Baz"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  32,
 											EndPos:    35,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  31,
+													EndPos:    32,
+												},
+											},
+										},
 									},
 									Value: []byte("Baz"),
 								},
@@ -14232,16 +33340,47 @@ func TestStmtUse_MixedGroupUse(t *testing.T) {
 						},
 					},
 				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    22,
+						},
+					},
+				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  35,
+						EndPos:    36,
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  36,
+						EndPos:    37,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14249,26 +33388,84 @@ func TestStmtBreak_Empty(t *testing.T) {
 	src := `<? while (1) { break; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtWhile{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				WhileTkn: &token.Token{
+					ID:    token.T_WHILE,
+					Value: []byte("while"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
 					},
 				},
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -14278,38 +33475,119 @@ func TestStmtBreak_Empty(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    23,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  13,
-							EndPos:    23,
+							EndPos:    14,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{
 						&ast.StmtBreak{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    21,
+							},
+							BreakTkn: &token.Token{
+								ID:    token.T_BREAK,
+								Value: []byte("break"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
+									EndPos:    20,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
+								},
+							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  20,
 									EndPos:    21,
 								},
 							},
 						},
 					},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  22,
+							EndPos:    23,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  21,
+									EndPos:    22,
+								},
+							},
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14317,26 +33595,84 @@ func TestStmtBreak_Light(t *testing.T) {
 	src := `<? while (1) { break 2; }`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    25,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    25,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtWhile{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    25,
+				},
+				WhileTkn: &token.Token{
+					ID:    token.T_WHILE,
+					Value: []byte("while"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    25,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
 					},
 				},
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -14346,49 +33682,150 @@ func TestStmtBreak_Light(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    25,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  13,
-							EndPos:    25,
+							EndPos:    14,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{
 						&ast.StmtBreak{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    23,
+							},
+							BreakTkn: &token.Token{
+								ID:    token.T_BREAK,
+								Value: []byte("break"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
-									EndPos:    23,
+									EndPos:    20,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
 								},
 							},
 							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  21,
+									EndPos:    22,
+								},
+								NumberTkn: &token.Token{
+									ID:    token.T_LNUMBER,
+									Value: []byte("2"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  21,
 										EndPos:    22,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  20,
+												EndPos:    21,
+											},
+										},
+									},
 								},
 								Value: []byte("2"),
 							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  22,
+									EndPos:    23,
+								},
+							},
+						},
+					},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  24,
+							EndPos:    25,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
+								},
+							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14396,27 +33833,84 @@ func TestStmtBreak(t *testing.T) {
 	src := `<? while (1) : break(3); endwhile;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    34,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    34,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtWhile{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    34,
+				},
+				WhileTkn: &token.Token{
+					ID:    token.T_WHILE,
+					Value: []byte("while"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    34,
+						EndPos:    8,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
 					},
 				},
-				Alt: true,
 				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+					NumberTkn: &token.Token{
+						ID:    token.T_LNUMBER,
+						Value: []byte("1"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
@@ -14426,49 +33920,176 @@ func TestStmtBreak(t *testing.T) {
 					},
 					Value: []byte("1"),
 				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  15,
-							EndPos:    24,
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
+				ColonTkn: &token.Token{
+					ID:    token.ID(58),
+					Value: []byte(":"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
 						},
 					},
+				},
+				Stmt: &ast.StmtStmtList{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    24,
+					},
 					Stmts: []ast.Vertex{
 						&ast.StmtBreak{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    24,
+							},
+							BreakTkn: &token.Token{
+								ID:    token.T_BREAK,
+								Value: []byte("break"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
-									EndPos:    24,
+									EndPos:    20,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
 								},
 							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
+							Expr: &ast.ParserBrackets{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  20,
+									EndPos:    23,
+								},
+								OpenBracketTkn: &token.Token{
+									ID:    token.ID(40),
+									Value: []byte("("),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  20,
+										EndPos:    21,
+									},
+								},
+								Child: &ast.ScalarLnumber{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  21,
 										EndPos:    22,
 									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
+										Value: []byte("3"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  21,
+											EndPos:    22,
+										},
+									},
+									Value: []byte("3"),
+								},
+								CloseBracketTkn: &token.Token{
+									ID:    token.ID(41),
+									Value: []byte(")"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  22,
+										EndPos:    23,
+									},
+								},
+							},
+							SemiColonTkn: &token.Token{
+								ID:    token.ID(59),
+								Value: []byte(";"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
 								},
-								Value: []byte("3"),
 							},
 						},
 					},
 				},
+				EndWhileTkn: &token.Token{
+					ID:    token.T_ENDWHILE,
+					Value: []byte("endwhile"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  25,
+						EndPos:    33,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  33,
+						EndPos:    34,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14478,56 +34099,96 @@ func TestExprArrayDimFetch(t *testing.T) {
 	src := `<? $a[1];`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    9,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    9,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    9,
+				},
+				Expr: &ast.ExprArrayDimFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    9,
+						EndPos:    8,
 					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
+					Var: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    8,
+							EndPos:    5,
 						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(91),
+						Value: []byte("["),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    6,
+						},
+					},
 					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
+						},
+						NumberTkn: &token.Token{
+							ID:    token.T_LNUMBER,
+							Value: []byte("1"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -14537,17 +34198,36 @@ func TestExprArrayDimFetch(t *testing.T) {
 						},
 						Value: []byte("1"),
 					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(93),
+						Value: []byte("]"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14555,65 +34235,103 @@ func TestExprArrayDimFetch_Nested(t *testing.T) {
 	src := `<? $a[1][2];`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprArrayDimFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
+					Var: &ast.ExprArrayDimFetch{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
+							EndPos:    8,
 						},
-					},
-					Var: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
+						Var: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    8,
+								EndPos:    5,
 							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    5,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("$a"),
 							},
 						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(91),
+							Value: []byte("["),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    6,
+							},
+						},
 						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  6,
+								EndPos:    7,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -14623,9 +34341,37 @@ func TestExprArrayDimFetch_Nested(t *testing.T) {
 							},
 							Value: []byte("1"),
 						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(93),
+							Value: []byte("]"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    8,
+							},
+						},
+					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(91),
+						Value: []byte("["),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
+						},
 					},
 					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    10,
+						},
+						NumberTkn: &token.Token{
+							ID:    token.T_LNUMBER,
+							Value: []byte("2"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -14635,17 +34381,36 @@ func TestExprArrayDimFetch_Nested(t *testing.T) {
 						},
 						Value: []byte("2"),
 					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(93),
+						Value: []byte("]"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14653,45 +34418,99 @@ func TestExprArray(t *testing.T) {
 	src := `<? array();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    11,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    11,
+				},
+				Expr: &ast.ExprArray{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    11,
+						EndPos:    10,
 					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
+					ArrayTkn: &token.Token{
+						ID:    token.T_ARRAY,
+						Value: []byte("array"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
+						},
+					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
 							EndPos:    10,
 						},
 					},
-					Items: []ast.Vertex{},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14699,45 +34518,87 @@ func TestExprArray_Item(t *testing.T) {
 	src := `<? array(1);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprArray{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
+					ArrayTkn: &token.Token{
+						ID:    token.T_ARRAY,
+						Value: []byte("array"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
 						},
 					},
 					Items: []ast.Vertex{
 						&ast.ExprArrayItem{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    10,
+							},
+							Val: &ast.ScalarLnumber{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    10,
 								},
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
+								NumberTkn: &token.Token{
+									ID:    token.T_LNUMBER,
+									Value: []byte("1"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -14749,17 +34610,36 @@ func TestExprArray_Item(t *testing.T) {
 							},
 						},
 					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14767,45 +34647,87 @@ func TestExprArray_Items(t *testing.T) {
 	src := `<? array(1=>1, &$b,);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    21,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    21,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    21,
+				},
+				Expr: &ast.ExprArray{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    21,
+						EndPos:    20,
 					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
+					ArrayTkn: &token.Token{
+						ID:    token.T_ARRAY,
+						Value: []byte("array"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    20,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
 						},
 					},
 					Items: []ast.Vertex{
 						&ast.ExprArrayItem{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    13,
+							},
+							Key: &ast.ScalarLnumber{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
-									EndPos:    13,
+									EndPos:    10,
 								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
+								NumberTkn: &token.Token{
+									ID:    token.T_LNUMBER,
+									Value: []byte("1"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -14815,8 +34737,26 @@ func TestExprArray_Items(t *testing.T) {
 								},
 								Value: []byte("1"),
 							},
+							DoubleArrowTkn: &token.Token{
+								ID:    token.T_DOUBLE_ARROW,
+								Value: []byte("=>"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    12,
+								},
+							},
 							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    13,
+								},
+								NumberTkn: &token.Token{
+									ID:    token.T_LNUMBER,
+									Value: []byte("1"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -14828,34 +34768,58 @@ func TestExprArray_Items(t *testing.T) {
 							},
 						},
 						&ast.ExprArrayItem{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  15,
+								EndPos:    18,
+							},
+							Val: &ast.ExprReference{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
 									EndPos:    18,
 								},
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
+								AmpersandTkn: &token.Token{
+									ID:    token.ID(38),
+									Value: []byte("&"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  15,
-										EndPos:    18,
+										EndPos:    16,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  14,
+												EndPos:    15,
+											},
+										},
 									},
 								},
 								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    18,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  16,
 											EndPos:    18,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$b"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -14870,17 +34834,58 @@ func TestExprArray_Items(t *testing.T) {
 						},
 						&ast.ExprArrayItem{},
 					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    14,
+							},
+						},
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  18,
+								EndPos:    19,
+							},
+						},
+					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  19,
+							EndPos:    20,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14888,55 +34893,104 @@ func TestExprArray_ItemUnpack(t *testing.T) {
 	src := `<? array(...$b);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    16,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    16,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    16,
+				},
+				Expr: &ast.ExprArray{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    16,
+						EndPos:    15,
 					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
+					ArrayTkn: &token.Token{
+						ID:    token.T_ARRAY,
+						Value: []byte("array"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    15,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
 						},
 					},
 					Items: []ast.Vertex{
 						&ast.ExprArrayItem{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    14,
+							},
+							EllipsisTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
-									EndPos:    14,
+									EndPos:    12,
 								},
 							},
-							Unpack: true,
 							Val: &ast.ExprVariable{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    14,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  12,
 										EndPos:    14,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -14949,17 +35003,36 @@ func TestExprArray_ItemUnpack(t *testing.T) {
 							},
 						},
 					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    15,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14967,67 +35040,160 @@ func TestExprArrowFunction(t *testing.T) {
 	src := `<? fn() => $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				Expr: &ast.ExprArrowFunction{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    13,
 					},
-				},
-				Expr: &ast.ExprArrowFunction{
-					Node: ast.Node{
+					FnTkn: &token.Token{
+						ID:    token.T_FN,
+						Value: []byte("fn"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    13,
+							EndPos:    5,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    6,
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
+						},
+					},
+					DoubleArrowTkn: &token.Token{
+						ID:    token.T_DOUBLE_ARROW,
+						Value: []byte("=>"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    10,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  7,
+									EndPos:    8,
+								},
+							},
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    13,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  11,
 								EndPos:    13,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  11,
 									EndPos:    13,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  10,
+											EndPos:    11,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15035,90 +35201,257 @@ func TestExprArrowFunction_ReturnType(t *testing.T) {
 	src := `<? fn & () : foo => $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				Expr: &ast.ExprArrowFunction{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    22,
 					},
-				},
-				Expr: &ast.ExprArrowFunction{
-					Node: ast.Node{
+					FnTkn: &token.Token{
+						ID:    token.T_FN,
+						Value: []byte("fn"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    22,
+							EndPos:    5,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
-					Static:     false,
-					ReturnsRef: true,
-					ReturnType: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  13,
-								EndPos:    16,
+					AmpersandTkn: &token.Token{
+						ID:    token.ID(38),
+						Value: []byte("&"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
 							},
 						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  7,
+									EndPos:    8,
+								},
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    10,
+						},
+					},
+					ColonTkn: &token.Token{
+						ID:    token.ID(58),
+						Value: []byte(":"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+							},
+						},
+					},
+					ReturnType: &ast.NameName{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    16,
+						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    16,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  13,
 										EndPos:    16,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  12,
+												EndPos:    13,
+											},
+										},
+									},
 								},
 								Value: []byte("foo"),
 							},
 						},
 					},
+					DoubleArrowTkn: &token.Token{
+						ID:    token.T_DOUBLE_ARROW,
+						Value: []byte("=>"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  17,
+							EndPos:    19,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  16,
+									EndPos:    17,
+								},
+							},
+						},
+					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    22,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  20,
 								EndPos:    22,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  20,
 									EndPos:    22,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    20,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15126,44 +35459,76 @@ func TestExprBitwiseNot(t *testing.T) {
 	src := `<? ~$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprBitwiseNot{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprBitwiseNot{
-					Node: ast.Node{
+					TildaTkn: &token.Token{
+						ID:    token.ID(126),
+						Value: []byte("~"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    6,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  4,
+							EndPos:    6,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  4,
 								EndPos:    6,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -15175,16 +35540,25 @@ func TestExprBitwiseNot(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15192,44 +35566,76 @@ func TestExprBooleanNot(t *testing.T) {
 	src := `<? !$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprBooleanNot{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprBooleanNot{
-					Node: ast.Node{
+					ExclamationTkn: &token.Token{
+						ID:    token.ID(33),
+						Value: []byte("!"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    6,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  4,
+							EndPos:    6,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  4,
 								EndPos:    6,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -15241,16 +35647,25 @@ func TestExprBooleanNot(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15258,58 +35673,98 @@ func TestExprClassConstFetch(t *testing.T) {
 	src := `<? Foo::Bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprClassConstFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprClassConstFetch{
-					Node: ast.Node{
+					Class: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    6,
-							},
+							EndPos:    6,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  3,
+									EndPos:    6,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    6,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("Foo"),
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    8,
+						},
+					},
 					ConstantName: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    11,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("Bar"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -15320,16 +35775,25 @@ func TestExprClassConstFetch(t *testing.T) {
 						Value: []byte("Bar"),
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15337,46 +35801,88 @@ func TestExprClassConstFetch_Static(t *testing.T) {
 	src := `<? static::bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				Expr: &ast.ExprClassConstFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    14,
 					},
-				},
-				Expr: &ast.ExprClassConstFetch{
-					Node: ast.Node{
+					Class: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    14,
+							EndPos:    9,
 						},
-					},
-					Class: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STATIC,
+							Value: []byte("static"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    9,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("static"),
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+					},
 					ConstantName: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    14,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("bar"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -15387,16 +35893,25 @@ func TestExprClassConstFetch_Static(t *testing.T) {
 						Value: []byte("bar"),
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15404,65 +35919,134 @@ func TestExprClone_Brackets(t *testing.T) {
 	src := `<? clone($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ExprClone{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprClone{
-					Node: ast.Node{
+					CloneTkn: &token.Token{
+						ID:    token.T_CLONE,
+						Value: []byte("clone"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+					Expr: &ast.ParserBrackets{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    12,
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+						Child: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  9,
+										EndPos:    11,
+									},
+								},
+								Value: []byte("$a"),
 							},
-							Value: []byte("$a"),
 						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15470,65 +36054,118 @@ func TestExprClone(t *testing.T) {
 	src := `<? clone $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprClone{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprClone{
-					Node: ast.Node{
+					CloneTkn: &token.Token{
+						ID:    token.T_CLONE,
+						Value: []byte("clone"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  8,
+											EndPos:    9,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15536,47 +36173,120 @@ func TestExprClosure(t *testing.T) {
 	src := `<? function(){};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    16,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    16,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    16,
+				},
+				Expr: &ast.ExprClosure{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    16,
+						EndPos:    15,
 					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
+					FunctionTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
+							EndPos:    11,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    14,
+						},
+					},
+					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
 							EndPos:    15,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
-					Stmts:      []ast.Vertex{},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15584,56 +36294,94 @@ func TestExprClosure_Use(t *testing.T) {
 	src := `<? function($a, $b) use ($c, &$d) {};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    37,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    37,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    37,
+				},
+				Expr: &ast.ExprClosure{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    37,
+						EndPos:    36,
 					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
+					FunctionTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    36,
+							EndPos:    11,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    14,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  12,
 									EndPos:    14,
 								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  12,
 										EndPos:    14,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$a"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -15646,58 +36394,144 @@ func TestExprClosure_Use(t *testing.T) {
 							},
 						},
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    18,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  16,
 									EndPos:    18,
 								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  16,
 										EndPos:    18,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  16,
 											EndPos:    18,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  15,
+													EndPos:    16,
+												},
+											},
+										},
 									},
 									Value: []byte("$b"),
 								},
 							},
 						},
 					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    19,
+						},
+					},
 					ClosureUse: &ast.ExprClosureUse{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    33,
+						},
+						UseTkn: &token.Token{
+							ID:    token.T_USE,
+							Value: []byte("use"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  20,
-								EndPos:    33,
+								EndPos:    23,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    20,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  23,
+										EndPos:    24,
+									},
+								},
 							},
 						},
 						Uses: []ast.Vertex{
 							&ast.ExprVariable{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  25,
+									EndPos:    27,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  25,
 										EndPos:    27,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$c"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -15709,25 +36543,51 @@ func TestExprClosure_Use(t *testing.T) {
 								},
 							},
 							&ast.ExprReference{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  29,
+									EndPos:    32,
+								},
+								AmpersandTkn: &token.Token{
+									ID:    token.ID(38),
+									Value: []byte("&"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  29,
-										EndPos:    32,
+										EndPos:    30,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  28,
+												EndPos:    29,
+											},
+										},
 									},
 								},
 								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  30,
+										EndPos:    32,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    32,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$d"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -15740,19 +36600,82 @@ func TestExprClosure_Use(t *testing.T) {
 								},
 							},
 						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    28,
+								},
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  32,
+								EndPos:    33,
+							},
+						},
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  34,
+							EndPos:    35,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  33,
+									EndPos:    34,
+								},
+							},
+						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  35,
+							EndPos:    36,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  36,
+						EndPos:    37,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15760,56 +36683,94 @@ func TestExprClosure_Use2(t *testing.T) {
 	src := `<? function($a, $b) use (&$c, $d) {};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    37,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    37,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    37,
+				},
+				Expr: &ast.ExprClosure{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    37,
+						EndPos:    36,
 					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
+					FunctionTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    36,
+							EndPos:    11,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					Params: []ast.Vertex{
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    14,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  12,
 									EndPos:    14,
 								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  12,
 										EndPos:    14,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$a"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
@@ -15822,67 +36783,161 @@ func TestExprClosure_Use2(t *testing.T) {
 							},
 						},
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    18,
+							},
+							Var: &ast.ExprVariable{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  16,
 									EndPos:    18,
 								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  16,
 										EndPos:    18,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  16,
 											EndPos:    18,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  15,
+													EndPos:    16,
+												},
+											},
+										},
 									},
 									Value: []byte("$b"),
 								},
 							},
 						},
 					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    19,
+						},
+					},
 					ClosureUse: &ast.ExprClosureUse{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    33,
+						},
+						UseTkn: &token.Token{
+							ID:    token.T_USE,
+							Value: []byte("use"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  20,
-								EndPos:    33,
+								EndPos:    23,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  19,
+										EndPos:    20,
+									},
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  24,
+								EndPos:    25,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  23,
+										EndPos:    24,
+									},
+								},
 							},
 						},
 						Uses: []ast.Vertex{
 							&ast.ExprReference{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  25,
+									EndPos:    28,
+								},
+								AmpersandTkn: &token.Token{
+									ID:    token.ID(38),
+									Value: []byte("&"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  25,
-										EndPos:    28,
+										EndPos:    26,
 									},
 								},
 								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  26,
+										EndPos:    28,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  26,
 											EndPos:    28,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$c"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -15895,40 +36950,121 @@ func TestExprClosure_Use2(t *testing.T) {
 								},
 							},
 							&ast.ExprVariable{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  30,
+									EndPos:    32,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  30,
 										EndPos:    32,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$d"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  30,
 											EndPos:    32,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 1,
+													EndLine:   1,
+													StartPos:  29,
+													EndPos:    30,
+												},
+											},
+										},
 									},
 									Value: []byte("$d"),
 								},
 							},
 						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  28,
+									EndPos:    29,
+								},
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  32,
+								EndPos:    33,
+							},
+						},
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  34,
+							EndPos:    35,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  33,
+									EndPos:    34,
+								},
+							},
+						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  35,
+							EndPos:    36,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  36,
+						EndPos:    37,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15936,70 +37072,183 @@ func TestExprClosure_ReturnType(t *testing.T) {
 	src := `<? function(): void {};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				Expr: &ast.ExprClosure{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    22,
 					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
+					FunctionTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    22,
+							EndPos:    11,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
+					ColonTkn: &token.Token{
+						ID:    token.ID(58),
+						Value: []byte(":"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    14,
 						},
 					},
-					ReturnsRef: false,
-					Static:     false,
 					ReturnType: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  15,
-								EndPos:    19,
-							},
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    19,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  15,
+									EndPos:    19,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("void"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  15,
 										EndPos:    19,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  14,
+												EndPos:    15,
+											},
+										},
+									},
 								},
 								Value: []byte("void"),
 							},
 						},
 					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    21,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  19,
+									EndPos:    20,
+								},
+							},
+						},
+					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    22,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16007,67 +37256,98 @@ func TestExprConstFetch(t *testing.T) {
 	src := `<? foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprConstFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
+					Const: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    6,
 						},
-					},
-					Const: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    6,
-							},
-						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  3,
+									EndPos:    6,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    6,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("foo"),
 							},
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16075,45 +37355,87 @@ func TestExprConstFetch_Relative(t *testing.T) {
 	src := `<? namespace\foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				Expr: &ast.ExprConstFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    16,
 					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
+					Const: &ast.NameRelative{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    16,
 						},
-					},
-					Const: &ast.NameRelative{
-						Node: ast.Node{
+						NsTkn: &token.Token{
+							ID:    token.T_NAMESPACE,
+							Value: []byte("namespace"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    16,
+								EndPos:    12,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    16,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -16126,16 +37448,25 @@ func TestExprConstFetch_Relative(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16143,45 +37474,77 @@ func TestExprConstFetch_FullyQualified(t *testing.T) {
 	src := `<? \foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    8,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    8,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    8,
+				},
+				Expr: &ast.ExprConstFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    8,
+						EndPos:    7,
 					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
+					Const: &ast.NameFullyQualified{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    7,
 						},
-					},
-					Const: &ast.NameFullyQualified{
-						Node: ast.Node{
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    7,
+								EndPos:    4,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    7,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -16194,16 +37557,25 @@ func TestExprConstFetch_FullyQualified(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16211,44 +37583,86 @@ func TestExprEmpty(t *testing.T) {
 	src := `<? empty($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ExprEmpty{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprEmpty{
-					Node: ast.Node{
+					EmptyTkn: &token.Token{
+						ID:    token.T_EMPTY,
+						Value: []byte("empty"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -16259,17 +37673,36 @@ func TestExprEmpty(t *testing.T) {
 							Value: []byte("$a"),
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16277,44 +37710,76 @@ func TestExprErrorSuppress(t *testing.T) {
 	src := `<? @$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprErrorSuppress{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprErrorSuppress{
-					Node: ast.Node{
+					AtTkn: &token.Token{
+						ID:    token.ID(64),
+						Value: []byte("@"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    6,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  4,
+							EndPos:    6,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  4,
 								EndPos:    6,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -16326,16 +37791,25 @@ func TestExprErrorSuppress(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16343,44 +37817,86 @@ func TestExprEval(t *testing.T) {
 	src := `<? eval($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprEval{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprEval{
-					Node: ast.Node{
+					EvalTkn: &token.Token{
+						ID:    token.T_EVAL,
+						Value: []byte("eval"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
+							EndPos:    7,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    10,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  8,
 								EndPos:    10,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -16391,17 +37907,36 @@ func TestExprEval(t *testing.T) {
 							Value: []byte("$a"),
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16409,45 +37944,79 @@ func TestExprExit(t *testing.T) {
 	src := `<? exit;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    8,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    8,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    8,
+				},
+				Expr: &ast.ExprExit{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    8,
+						EndPos:    7,
 					},
-				},
-				Expr: &ast.ExprExit{
-					Die: false,
-					Node: ast.Node{
+					DieTkn: &token.Token{
+						ID:    token.T_EXIT,
+						Value: []byte("exit"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    7,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16455,45 +38024,99 @@ func TestExprExit_Empty(t *testing.T) {
 	src := `<? exit();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    10,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    10,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    10,
+				},
+				Expr: &ast.ExprExit{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    10,
+						EndPos:    9,
 					},
-				},
-				Expr: &ast.ExprExit{
-					Die: false,
-					Node: ast.Node{
+					DieTkn: &token.Token{
+						ID:    token.T_EXIT,
+						Value: []byte("exit"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
+							EndPos:    7,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
 							EndPos:    9,
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    10,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16501,45 +38124,86 @@ func TestExprExit_Expr(t *testing.T) {
 	src := `<? exit($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprExit{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprExit{
-					Die: false,
-					Node: ast.Node{
+					DieTkn: &token.Token{
+						ID:    token.T_EXIT,
+						Value: []byte("exit"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
+							EndPos:    7,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    10,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  8,
 								EndPos:    10,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -16550,17 +38214,36 @@ func TestExprExit_Expr(t *testing.T) {
 							Value: []byte("$a"),
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16568,45 +38251,79 @@ func TestExprDie(t *testing.T) {
 	src := `<? die;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprExit{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprExit{
-					Die: true,
-					Node: ast.Node{
+					DieTkn: &token.Token{
+						ID:    token.T_EXIT,
+						Value: []byte("die"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    6,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16614,45 +38331,99 @@ func TestExprDie_Empty(t *testing.T) {
 	src := `<? die();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    9,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    9,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    9,
+				},
+				Expr: &ast.ExprExit{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    9,
+						EndPos:    8,
 					},
-				},
-				Expr: &ast.ExprExit{
-					Die: true,
-					Node: ast.Node{
+					DieTkn: &token.Token{
+						ID:    token.T_EXIT,
+						Value: []byte("die"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
+							EndPos:    6,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
 							EndPos:    8,
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16660,45 +38431,86 @@ func TestExprDie_Expr(t *testing.T) {
 	src := `<? die($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    11,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    11,
+				},
+				Expr: &ast.ExprExit{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    11,
+						EndPos:    10,
 					},
-				},
-				Expr: &ast.ExprExit{
-					Die: true,
-					Node: ast.Node{
+					DieTkn: &token.Token{
+						ID:    token.T_EXIT,
+						Value: []byte("die"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    10,
+							EndPos:    6,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    9,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
 								EndPos:    9,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -16709,17 +38521,36 @@ func TestExprDie_Expr(t *testing.T) {
 							Value: []byte("$a"),
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    10,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16727,77 +38558,118 @@ func TestExprFunctionCall(t *testing.T) {
 	src := `<? foo();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    9,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    9,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    9,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    9,
+						EndPos:    8,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    8,
-						},
-					},
-					Function: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    6,
-							},
+							EndPos:    6,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  3,
+									EndPos:    6,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    6,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("foo"),
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  6,
-								EndPos:    8,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16805,45 +38677,87 @@ func TestExprFunctionCall_Relative(t *testing.T) {
 	src := `<? namespace\foo();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    18,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.NameRelative{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    18,
+							EndPos:    16,
 						},
-					},
-					Function: &ast.NameRelative{
-						Node: ast.Node{
+						NsTkn: &token.Token{
+							ID:    token.T_NAMESPACE,
+							Value: []byte("namespace"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    16,
+								EndPos:    12,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    16,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -16855,27 +38769,46 @@ func TestExprFunctionCall_Relative(t *testing.T) {
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  16,
-								EndPos:    18,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    17,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  17,
+							EndPos:    18,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16883,45 +38816,77 @@ func TestExprFunctionCall_FullyQualified(t *testing.T) {
 	src := `<? \foo([]);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.NameFullyQualified{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
+							EndPos:    7,
 						},
-					},
-					Function: &ast.NameFullyQualified{
-						Node: ast.Node{
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    7,
+								EndPos:    4,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    7,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -16933,52 +38898,84 @@ func TestExprFunctionCall_FullyQualified(t *testing.T) {
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  7,
-								EndPos:    11,
+								StartPos:  8,
+								EndPos:    10,
 							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
+							Expr: &ast.ExprArray{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    10,
+								},
+								OpenBracketTkn: &token.Token{
+									ID:    token.ID(91),
+									Value: []byte("["),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
-										EndPos:    10,
+										EndPos:    9,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
-								Expr: &ast.ExprShortArray{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  8,
-											EndPos:    10,
-										},
+								CloseBracketTkn: &token.Token{
+									ID:    token.ID(93),
+									Value: []byte("]"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  9,
+										EndPos:    10,
 									},
-									Items: []ast.Vertex{},
 								},
 							},
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16986,120 +38983,183 @@ func TestExprFunctionCall_Var(t *testing.T) {
 	src := `<? $foo(yield $a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    18,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    18,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    18,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    18,
+						EndPos:    17,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    17,
+							EndPos:    7,
 						},
-					},
-					Function: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    7,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    7,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$foo"),
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  7,
-								EndPos:    17,
+								StartPos:  8,
+								EndPos:    16,
 							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
+							Expr: &ast.ExprYield{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    16,
+								},
+								YieldTkn: &token.Token{
+									ID:    token.T_YIELD,
+									Value: []byte("yield"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
-										EndPos:    16,
+										EndPos:    13,
 									},
 								},
-								Variadic:    false,
-								IsReference: false,
-								Expr: &ast.ExprYield{
-									Node: ast.Node{
+								Value: &ast.ExprVariable{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    16,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
-											StartPos:  8,
+											StartPos:  14,
 											EndPos:    16,
 										},
-									},
-									Value: &ast.ExprVariable{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  14,
 												EndPos:    16,
 											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  14,
-													EndPos:    16,
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  13,
+														EndPos:    14,
+													},
 												},
 											},
-											Value: []byte("$a"),
 										},
+										Value: []byte("$a"),
 									},
 								},
 							},
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    17,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17107,88 +39167,120 @@ func TestExprFunctionCall_ExprArg(t *testing.T) {
 	src := `<? ceil($foo/3);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    16,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    16,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    16,
+				},
+				Expr: &ast.ExprFunctionCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    16,
+						EndPos:    15,
 					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
+					Function: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    15,
-						},
-					},
-					Function: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    7,
-							},
+							EndPos:    7,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  3,
+									EndPos:    7,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("ceil"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    7,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("ceil"),
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    8,
+						},
+					},
+					Arguments: []ast.Vertex{
+						&ast.Argument{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
-								StartPos:  7,
-								EndPos:    15,
+								StartPos:  8,
+								EndPos:    14,
 							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
+							Expr: &ast.ExprBinaryDiv{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    14,
+								},
+								Left: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
-										EndPos:    14,
+										EndPos:    12,
 									},
-								},
-								Variadic:    false,
-								IsReference: false,
-								Expr: &ast.ExprBinaryDiv{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  8,
-											EndPos:    14,
+											EndPos:    12,
 										},
-									},
-									Left: &ast.ExprVariable{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$foo"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -17196,44 +39288,71 @@ func TestExprFunctionCall_ExprArg(t *testing.T) {
 												EndPos:    12,
 											},
 										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  8,
-													EndPos:    12,
-												},
-											},
-											Value: []byte("$foo"),
-										},
+										Value: []byte("$foo"),
 									},
-									Right: &ast.ScalarLnumber{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  13,
-												EndPos:    14,
-											},
-										},
+								},
+								OpTkn: &token.Token{
+									ID:    token.ID(47),
+									Value: []byte("/"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    13,
+									},
+								},
+								Right: &ast.ScalarLnumber{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  13,
+										EndPos:    14,
+									},
+									NumberTkn: &token.Token{
+										ID:    token.T_LNUMBER,
 										Value: []byte("3"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  13,
+											EndPos:    14,
+										},
 									},
+									Value: []byte("3"),
 								},
 							},
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    15,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17241,65 +39360,106 @@ func TestExprPostDec(t *testing.T) {
 	src := `<? $a--;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    8,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    8,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    8,
+				},
+				Expr: &ast.ExprPostDec{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    8,
+						EndPos:    7,
 					},
-				},
-				Expr: &ast.ExprPostDec{
-					Node: ast.Node{
+					Var: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    7,
+							EndPos:    5,
 						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					DecTkn: &token.Token{
+						ID:    token.T_DEC,
+						Value: []byte("--"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    7,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17307,65 +39467,106 @@ func TestExprPostInc(t *testing.T) {
 	src := `<? $a++;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    8,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    8,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    8,
+				},
+				Expr: &ast.ExprPostInc{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    8,
+						EndPos:    7,
 					},
-				},
-				Expr: &ast.ExprPostInc{
-					Node: ast.Node{
+					Var: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    7,
+							EndPos:    5,
 						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					IncTkn: &token.Token{
+						ID:    token.T_INC,
+						Value: []byte("++"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    7,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17373,44 +39574,76 @@ func TestExprPreDec(t *testing.T) {
 	src := `<? --$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    8,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    8,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    8,
+				},
+				Expr: &ast.ExprPreDec{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    8,
+						EndPos:    7,
 					},
-				},
-				Expr: &ast.ExprPreDec{
-					Node: ast.Node{
+					DecTkn: &token.Token{
+						ID:    token.T_DEC,
+						Value: []byte("--"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    7,
+							EndPos:    5,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    7,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  5,
 								EndPos:    7,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -17422,16 +39655,25 @@ func TestExprPreDec(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17439,44 +39681,76 @@ func TestExprPreInc(t *testing.T) {
 	src := `<? ++$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    8,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    8,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    8,
+				},
+				Expr: &ast.ExprPreInc{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    8,
+						EndPos:    7,
 					},
-				},
-				Expr: &ast.ExprPreInc{
-					Node: ast.Node{
+					IncTkn: &token.Token{
+						ID:    token.T_INC,
+						Value: []byte("++"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    7,
+							EndPos:    5,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    7,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  5,
 								EndPos:    7,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -17488,16 +39762,25 @@ func TestExprPreInc(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  7,
+						EndPos:    8,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17505,65 +39788,118 @@ func TestExprInclude(t *testing.T) {
 	src := `<? include $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				Expr: &ast.ExprInclude{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    13,
 					},
-				},
-				Expr: &ast.ExprInclude{
-					Node: ast.Node{
+					IncludeTkn: &token.Token{
+						ID:    token.T_INCLUDE,
+						Value: []byte("include"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    13,
+							EndPos:    10,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    13,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  11,
 								EndPos:    13,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  11,
 									EndPos:    13,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  10,
+											EndPos:    11,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17571,65 +39907,118 @@ func TestExprInclude_Once(t *testing.T) {
 	src := `<? include_once $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				Expr: &ast.ExprIncludeOnce{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    18,
 					},
-				},
-				Expr: &ast.ExprIncludeOnce{
-					Node: ast.Node{
+					IncludeTkn: &token.Token{
+						ID:    token.T_INCLUDE_ONCE,
+						Value: []byte("include_once"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    18,
+							EndPos:    15,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    18,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
 								EndPos:    18,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  16,
 									EndPos:    18,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  15,
+											EndPos:    16,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17637,65 +40026,118 @@ func TestExprRequire(t *testing.T) {
 	src := `<? require $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				Expr: &ast.ExprRequire{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    13,
 					},
-				},
-				Expr: &ast.ExprRequire{
-					Node: ast.Node{
+					RequireTkn: &token.Token{
+						ID:    token.T_REQUIRE,
+						Value: []byte("require"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    13,
+							EndPos:    10,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    13,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  11,
 								EndPos:    13,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  11,
 									EndPos:    13,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  10,
+											EndPos:    11,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17703,65 +40145,118 @@ func TestExprRequire_Once(t *testing.T) {
 	src := `<? require_once $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				Expr: &ast.ExprRequireOnce{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    18,
 					},
-				},
-				Expr: &ast.ExprRequireOnce{
-					Node: ast.Node{
+					RequireOnceTkn: &token.Token{
+						ID:    token.T_REQUIRE_ONCE,
+						Value: []byte("require_once"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    18,
+							EndPos:    15,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    18,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
 								EndPos:    18,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  16,
 									EndPos:    18,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  15,
+											EndPos:    16,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17769,88 +40264,159 @@ func TestExprInstanceOf(t *testing.T) {
 	src := `<? $a instanceof Foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    21,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    21,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    21,
+				},
+				Expr: &ast.ExprInstanceOf{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    21,
+						EndPos:    20,
 					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
+					Expr: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    20,
+							EndPos:    5,
 						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  17,
-								EndPos:    20,
+					InstanceOfTkn: &token.Token{
+						ID:    token.T_INSTANCEOF,
+						Value: []byte("instanceof"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    16,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
 							},
 						},
+					},
+					Class: &ast.NameName{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  17,
+							EndPos:    20,
+						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  17,
+									EndPos:    20,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  17,
 										EndPos:    20,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  16,
+												EndPos:    17,
+											},
+										},
+									},
 								},
 								Value: []byte("Foo"),
 							},
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  20,
+						EndPos:    21,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17858,66 +40424,148 @@ func TestExprInstanceOf_Relative(t *testing.T) {
 	src := `<? $a instanceof namespace\Foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    31,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    31,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    31,
+				},
+				Expr: &ast.ExprInstanceOf{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    31,
+						EndPos:    30,
 					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
+					Expr: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    30,
+							EndPos:    5,
 						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					InstanceOfTkn: &token.Token{
+						ID:    token.T_INSTANCEOF,
+						Value: []byte("instanceof"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    16,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
+							},
+						},
+					},
 					Class: &ast.NameRelative{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  17,
+							EndPos:    30,
+						},
+						NsTkn: &token.Token{
+							ID:    token.T_NAMESPACE,
+							Value: []byte("namespace"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  17,
-								EndPos:    30,
+								EndPos:    26,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    17,
+									},
+								},
+							},
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  26,
+								EndPos:    27,
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  27,
+									EndPos:    30,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -17930,16 +40578,25 @@ func TestExprInstanceOf_Relative(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  30,
+						EndPos:    31,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17947,66 +40604,138 @@ func TestExprInstanceOf_FullyQualified(t *testing.T) {
 	src := `<? $a instanceof \Foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    22,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    22,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    22,
+				},
+				Expr: &ast.ExprInstanceOf{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    22,
+						EndPos:    21,
 					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
+					Expr: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    21,
+							EndPos:    5,
 						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					InstanceOfTkn: &token.Token{
+						ID:    token.T_INSTANCEOF,
+						Value: []byte("instanceof"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    16,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
+							},
+						},
+					},
 					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  17,
+							EndPos:    21,
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  17,
-								EndPos:    21,
+								EndPos:    18,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  16,
+										EndPos:    17,
+									},
+								},
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  18,
+									EndPos:    21,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -18019,16 +40748,25 @@ func TestExprInstanceOf_FullyQualified(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    22,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18036,45 +40774,87 @@ func TestExprIsset(t *testing.T) {
 	src := `<? isset($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ExprIsset{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprIsset{
-					Node: ast.Node{
+					IssetTkn: &token.Token{
+						ID:    token.T_ISSET,
+						Value: []byte("isset"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
 						},
 					},
 					Vars: []ast.Vertex{
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    11,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -18086,17 +40866,36 @@ func TestExprIsset(t *testing.T) {
 							},
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18104,45 +40903,87 @@ func TestExprIsset_Variables(t *testing.T) {
 	src := `<? isset($a, $b);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				Expr: &ast.ExprIsset{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    16,
 					},
-				},
-				Expr: &ast.ExprIsset{
-					Node: ast.Node{
+					IssetTkn: &token.Token{
+						ID:    token.T_ISSET,
+						Value: []byte("isset"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    16,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
 						},
 					},
 					Vars: []ast.Vertex{
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  9,
+								EndPos:    11,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -18154,38 +40995,87 @@ func TestExprIsset_Variables(t *testing.T) {
 							},
 						},
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    15,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    15,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  13,
 										EndPos:    15,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  12,
+												EndPos:    13,
+											},
+										},
+									},
 								},
 								Value: []byte("$b"),
 							},
 						},
 					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    16,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18193,76 +41083,168 @@ func TestExprList_Empty(t *testing.T) {
 	src := `<? list() = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    14,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    14,
+							EndPos:    9,
 						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
+						ListTkn: &token.Token{
+							ID:    token.T_LIST,
+							Value: []byte("list"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
+								EndPos:    7,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    8,
+							},
+						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
 								EndPos:    9,
 							},
 						},
-						Items: []ast.Vertex{},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  9,
+									EndPos:    10,
+								},
+							},
+						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    14,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
 								EndPos:    14,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  12,
 									EndPos:    14,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  11,
+											EndPos:    12,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18270,63 +41252,101 @@ func TestExprList(t *testing.T) {
 	src := `<? list($a) = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    16,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    16,
+							EndPos:    11,
 						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
+						ListTkn: &token.Token{
+							ID:    token.T_LIST,
+							Value: []byte("list"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    11,
+								EndPos:    7,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    8,
 							},
 						},
 						Items: []ast.Vertex{
 							&ast.ExprArrayItem{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    10,
+								},
+								Val: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
 										EndPos:    10,
 									},
-								},
-								Val: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  8,
 											EndPos:    10,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -18339,39 +41359,98 @@ func TestExprList(t *testing.T) {
 								},
 							},
 						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  11,
+									EndPos:    12,
+								},
+							},
+						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    16,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
 								EndPos:    16,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  14,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  13,
+											EndPos:    14,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18379,72 +41458,108 @@ func TestExprList_ArrayIndex(t *testing.T) {
 	src := `<? list($a[]) = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    18,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    18,
+							EndPos:    13,
 						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
+						ListTkn: &token.Token{
+							ID:    token.T_LIST,
+							Value: []byte("list"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    13,
+								EndPos:    7,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    8,
 							},
 						},
 						Items: []ast.Vertex{
 							&ast.ExprArrayItem{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    12,
+								},
+								Val: &ast.ExprArrayDimFetch{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
 										EndPos:    12,
 									},
-								},
-								Val: &ast.ExprArrayDimFetch{
-									Node: ast.Node{
+									Var: &ast.ExprVariable{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  8,
-											EndPos:    12,
+											EndPos:    10,
 										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
+										VarName: &ast.Identifier{
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  8,
 												EndPos:    10,
 											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
+											IdentifierTkn: &token.Token{
+												ID:    token.T_VARIABLE,
+												Value: []byte("$a"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
@@ -18455,42 +41570,121 @@ func TestExprList_ArrayIndex(t *testing.T) {
 											Value: []byte("$a"),
 										},
 									},
+									OpenBracketTkn: &token.Token{
+										ID:    token.ID(91),
+										Value: []byte("["),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  10,
+											EndPos:    11,
+										},
+									},
+									CloseBracketTkn: &token.Token{
+										ID:    token.ID(93),
+										Value: []byte("]"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  11,
+											EndPos:    12,
+										},
+									},
+								},
+							},
+						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    15,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    14,
 								},
 							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    18,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
 								EndPos:    18,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  16,
 									EndPos:    18,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  15,
+											EndPos:    16,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18498,82 +41692,136 @@ func TestExprList_List(t *testing.T) {
 	src := `<? list(list($a)) = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    22,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    22,
+							EndPos:    17,
 						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
+						ListTkn: &token.Token{
+							ID:    token.T_LIST,
+							Value: []byte("list"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    17,
+								EndPos:    7,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    8,
 							},
 						},
 						Items: []ast.Vertex{
 							&ast.ExprArrayItem{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    16,
+								},
+								Val: &ast.ExprList{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
 										EndPos:    16,
 									},
-								},
-								Val: &ast.ExprList{
-									Node: ast.Node{
+									ListTkn: &token.Token{
+										ID:    token.T_LIST,
+										Value: []byte("list"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  8,
-											EndPos:    16,
+											EndPos:    12,
+										},
+									},
+									OpenBracketTkn: &token.Token{
+										ID:    token.ID(40),
+										Value: []byte("("),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  12,
+											EndPos:    13,
 										},
 									},
 									Items: []ast.Vertex{
 										&ast.ExprArrayItem{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  13,
+												EndPos:    15,
+											},
+											Val: &ast.ExprVariable{
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  13,
 													EndPos:    15,
 												},
-											},
-											Val: &ast.ExprVariable{
-												Node: ast.Node{
+												VarName: &ast.Identifier{
 													Position: &position.Position{
 														StartLine: 1,
 														EndLine:   1,
 														StartPos:  13,
 														EndPos:    15,
 													},
-												},
-												VarName: &ast.Identifier{
-													Node: ast.Node{
+													IdentifierTkn: &token.Token{
+														ID:    token.T_VARIABLE,
+														Value: []byte("$a"),
 														Position: &position.Position{
 															StartLine: 1,
 															EndLine:   1,
@@ -18586,42 +41834,111 @@ func TestExprList_List(t *testing.T) {
 											},
 										},
 									},
+									CloseBracketTkn: &token.Token{
+										ID:    token.ID(41),
+										Value: []byte(")"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  15,
+											EndPos:    16,
+										},
+									},
+								},
+							},
+						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    19,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  17,
+									EndPos:    18,
 								},
 							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    22,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  20,
 								EndPos:    22,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  20,
 									EndPos:    22,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    20,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18629,109 +41946,230 @@ func TestExprList_EmptyItem(t *testing.T) {
 	src := `<? list(, $a) = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    18,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    18,
+							EndPos:    13,
 						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
+						ListTkn: &token.Token{
+							ID:    token.T_LIST,
+							Value: []byte("list"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    13,
+								EndPos:    7,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    8,
 							},
 						},
 						Items: []ast.Vertex{
 							&ast.ExprArrayItem{},
 							&ast.ExprArrayItem{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    12,
+								},
+								Val: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  10,
 										EndPos:    12,
 									},
-								},
-								Val: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  10,
 											EndPos:    12,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  10,
 												EndPos:    12,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  9,
+														EndPos:    10,
+													},
+												},
+											},
 										},
 										Value: []byte("$a"),
 									},
 								},
 							},
 						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    15,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    14,
+								},
+							},
+						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    18,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
 								EndPos:    18,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  16,
 									EndPos:    18,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  15,
+											EndPos:    16,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18739,71 +42177,121 @@ func TestExprList_EmptyItems(t *testing.T) {
 	src := `<? list(, , $a, ) = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    22,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    22,
+							EndPos:    17,
 						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
+						ListTkn: &token.Token{
+							ID:    token.T_LIST,
+							Value: []byte("list"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    17,
+								EndPos:    7,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  7,
+								EndPos:    8,
 							},
 						},
 						Items: []ast.Vertex{
 							&ast.ExprArrayItem{},
 							&ast.ExprArrayItem{},
 							&ast.ExprArrayItem{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  12,
+									EndPos:    14,
+								},
+								Val: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  12,
 										EndPos:    14,
 									},
-								},
-								Val: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  12,
 											EndPos:    14,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  12,
 												EndPos:    14,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 1,
+														EndLine:   1,
+														StartPos:  11,
+														EndPos:    12,
+													},
+												},
+											},
 										},
 										Value: []byte("$a"),
 									},
@@ -18811,39 +42299,154 @@ func TestExprList_EmptyItems(t *testing.T) {
 							},
 							&ast.ExprArrayItem{},
 						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    9,
+								},
+							},
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  9,
+											EndPos:    10,
+										},
+									},
+								},
+							},
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    15,
+								},
+							},
+						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  15,
+										EndPos:    16,
+									},
+								},
+							},
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    19,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  17,
+									EndPos:    18,
+								},
+							},
+						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    22,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  20,
 								EndPos:    22,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  20,
 									EndPos:    22,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  19,
+											EndPos:    20,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18851,56 +42454,96 @@ func TestExprMethodCall(t *testing.T) {
 	src := `<? $a->foo();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ExprMethodCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprMethodCall{
-					Node: ast.Node{
+					Var: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    5,
 						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					ObjectOperatorTkn: &token.Token{
+						ID:    token.T_OBJECT_OPERATOR,
+						Value: []byte("->"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    7,
+						},
+					},
 					Method: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    10,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("foo"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -18910,27 +42553,46 @@ func TestExprMethodCall(t *testing.T) {
 						},
 						Value: []byte("foo"),
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18938,67 +42600,120 @@ func TestExprNew(t *testing.T) {
 	src := `<? new Foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    11,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
-					},
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    11,
 				},
 				Expr: &ast.ExprNew{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   -1,
+						StartPos:  3,
+						EndPos:    -1,
+					},
+					NewTkn: &token.Token{
+						ID:    token.T_NEW,
+						Value: []byte("new"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    10,
+							EndPos:    6,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  7,
-								EndPos:    10,
-							},
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    10,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  7,
+									EndPos:    10,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  7,
 										EndPos:    10,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  6,
+												EndPos:    7,
+											},
+										},
+									},
 								},
 								Value: []byte("Foo"),
 							},
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19006,45 +42721,109 @@ func TestExprNew_Relative(t *testing.T) {
 	src := `<? new namespace\Foo();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				Expr: &ast.ExprNew{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    22,
 					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
+					NewTkn: &token.Token{
+						ID:    token.T_NEW,
+						Value: []byte("new"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    22,
+							EndPos:    6,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Class: &ast.NameRelative{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    20,
+						},
+						NsTkn: &token.Token{
+							ID:    token.T_NAMESPACE,
+							Value: []byte("namespace"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
-								EndPos:    20,
+								EndPos:    16,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  6,
+										EndPos:    7,
+									},
+								},
+							},
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  17,
+									EndPos:    20,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -19056,27 +42835,46 @@ func TestExprNew_Relative(t *testing.T) {
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  20,
-								EndPos:    22,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  20,
+							EndPos:    21,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    22,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19084,45 +42882,99 @@ func TestExprNew_FullyQualified(t *testing.T) {
 	src := `<? new \Foo();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				Expr: &ast.ExprNew{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    13,
 					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
+					NewTkn: &token.Token{
+						ID:    token.T_NEW,
+						Value: []byte("new"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    13,
+							EndPos:    6,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    11,
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
-								EndPos:    11,
+								EndPos:    8,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  6,
+										EndPos:    7,
+									},
+								},
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  8,
+									EndPos:    11,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -19134,27 +42986,46 @@ func TestExprNew_FullyQualified(t *testing.T) {
 							},
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  11,
-								EndPos:    13,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19162,65 +43033,135 @@ func TestExprNew_Anonymous(t *testing.T) {
 	src := `<? new class ($a, ...$b) {};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    28,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    28,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    28,
+				},
+				Expr: &ast.ExprNew{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    28,
+						EndPos:    27,
 					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
+					NewTkn: &token.Token{
+						ID:    token.T_NEW,
+						Value: []byte("new"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    27,
+							EndPos:    6,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Class: &ast.StmtClass{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    27,
+						},
+						ClassTkn: &token.Token{
+							ID:    token.T_CLASS,
+							Value: []byte("class"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  7,
-								EndPos:    27,
+								EndPos:    12,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  6,
+										EndPos:    7,
+									},
+								},
 							},
 						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    14,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  12,
+										EndPos:    13,
+									},
+								},
+							},
+						},
+						Arguments: []ast.Vertex{
+							&ast.Argument{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  13,
-									EndPos:    24,
+									StartPos:  14,
+									EndPos:    16,
 								},
-							},
-							Arguments: []ast.Vertex{
-								&ast.Argument{
-									Node: ast.Node{
+								Expr: &ast.ExprVariable{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    16,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  14,
 											EndPos:    16,
 										},
-									},
-									Variadic:    false,
-									IsReference: false,
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -19228,32 +43169,56 @@ func TestExprNew_Anonymous(t *testing.T) {
 												EndPos:    16,
 											},
 										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  14,
-													EndPos:    16,
-												},
+										Value: []byte("$a"),
+									},
+								},
+							},
+							&ast.Argument{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  18,
+									EndPos:    23,
+								},
+								VariadicTkn: &token.Token{
+									ID:    token.T_ELLIPSIS,
+									Value: []byte("..."),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  18,
+										EndPos:    21,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  17,
+												EndPos:    18,
 											},
-											Value: []byte("$a"),
 										},
 									},
 								},
-								&ast.Argument{
-									Node: ast.Node{
+								Expr: &ast.ExprVariable{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  21,
+										EndPos:    23,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
-											StartPos:  18,
+											StartPos:  21,
 											EndPos:    23,
 										},
-									},
-									IsReference: false,
-									Variadic:    true,
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$b"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -19261,34 +43226,87 @@ func TestExprNew_Anonymous(t *testing.T) {
 												EndPos:    23,
 											},
 										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  21,
-													EndPos:    23,
-												},
-											},
-											Value: []byte("$b"),
-										},
+										Value: []byte("$b"),
+									},
+								},
+							},
+						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  16,
+									EndPos:    17,
+								},
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  23,
+								EndPos:    24,
+							},
+						},
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    26,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  24,
+										EndPos:    25,
 									},
 								},
 							},
 						},
 						Stmts: []ast.Vertex{},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  26,
+								EndPos:    27,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  27,
+						EndPos:    28,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19296,65 +43314,134 @@ func TestExprPrint(t *testing.T) {
 	src := `<? print($a);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ExprPrint{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprPrint{
-					Node: ast.Node{
+					PrintTkn: &token.Token{
+						ID:    token.T_PRINT,
+						Value: []byte("print"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+					Expr: &ast.ParserBrackets{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    12,
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+						Child: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  9,
+										EndPos:    11,
+									},
+								},
+								Value: []byte("$a"),
 							},
-							Value: []byte("$a"),
 						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  11,
+								EndPos:    12,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19362,56 +43449,96 @@ func TestExprPropertyFetch(t *testing.T) {
 	src := `<? $a->foo;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    11,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    11,
+				},
+				Expr: &ast.ExprPropertyFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    11,
+						EndPos:    10,
 					},
-				},
-				Expr: &ast.ExprPropertyFetch{
-					Node: ast.Node{
+					Var: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    10,
+							EndPos:    5,
 						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					ObjectOperatorTkn: &token.Token{
+						ID:    token.T_OBJECT_OPERATOR,
+						Value: []byte("->"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    7,
+						},
+					},
 					Property: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    10,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("foo"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -19422,16 +43549,25 @@ func TestExprPropertyFetch(t *testing.T) {
 						Value: []byte("foo"),
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19440,35 +43576,91 @@ func TestExprReference_ForeachWithRef(t *testing.T) {
 	src := `<? foreach ($a as $k => &$v) {}`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    31,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    31,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtForeach{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    31,
+				},
+				ForeachTkn: &token.Token{
+					ID:    token.T_FOREACH,
+					Value: []byte("foreach"),
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    31,
+						EndPos:    10,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_OPEN_TAG,
+							Value: []byte("<?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  0,
+								EndPos:    2,
+							},
+						},
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  2,
+								EndPos:    3,
+							},
+						},
+					},
+				},
+				OpenParenthesisTkn: &token.Token{
+					ID:    token.ID(40),
+					Value: []byte("("),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    11,
+							},
+						},
 					},
 				},
 				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    14,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  12,
 							EndPos:    14,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -19479,47 +43671,135 @@ func TestExprReference_ForeachWithRef(t *testing.T) {
 						Value: []byte("$a"),
 					},
 				},
+				AsTkn: &token.Token{
+					ID:    token.T_AS,
+					Value: []byte("as"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    17,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  14,
+								EndPos:    15,
+							},
+						},
+					},
+				},
 				Key: &ast.ExprVariable{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    20,
+					},
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  18,
 							EndPos:    20,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$k"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  17,
+										EndPos:    18,
+									},
+								},
+							},
 						},
 						Value: []byte("$k"),
 					},
 				},
+				DoubleArrowTkn: &token.Token{
+					ID:    token.T_DOUBLE_ARROW,
+					Value: []byte("=>"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  21,
+						EndPos:    23,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  20,
+								EndPos:    21,
+							},
+						},
+					},
+				},
 				Var: &ast.ExprReference{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  24,
+						EndPos:    27,
+					},
+					AmpersandTkn: &token.Token{
+						ID:    token.ID(38),
+						Value: []byte("&"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  24,
-							EndPos:    27,
+							EndPos:    25,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  23,
+									EndPos:    24,
+								},
+							},
 						},
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  25,
+							EndPos:    27,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  25,
 								EndPos:    27,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$v"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -19531,27 +43811,66 @@ func TestExprReference_ForeachWithRef(t *testing.T) {
 						},
 					},
 				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  27,
+						EndPos:    28,
+					},
+				},
 				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  29,
+						EndPos:    31,
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  29,
-							EndPos:    31,
+							EndPos:    30,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  28,
+									EndPos:    29,
+								},
+							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  30,
+							EndPos:    31,
+						},
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19559,36 +43878,70 @@ func TestExprShellExec(t *testing.T) {
 	src := "<? `cmd $a`;"
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprShellExec{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprShellExec{
-					Node: ast.Node{
+					OpenBacktickTkn: &token.Token{
+						ID:    token.ID(96),
+						Value: []byte("`"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Parts: []ast.Vertex{
 						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    8,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("cmd "),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -19599,16 +43952,22 @@ func TestExprShellExec(t *testing.T) {
 							Value: []byte("cmd "),
 						},
 						&ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    10,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
 									EndPos:    10,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -19620,17 +43979,36 @@ func TestExprShellExec(t *testing.T) {
 							},
 						},
 					},
+					CloseBacktickTkn: &token.Token{
+						ID:    token.ID(96),
+						Value: []byte("`"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19638,45 +44016,89 @@ func TestExprShortArray(t *testing.T) {
 	src := `<? [];`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    6,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    6,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    6,
+				},
+				Expr: &ast.ExprArray{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    6,
+						EndPos:    5,
 					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(91),
+						Value: []byte("["),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(93),
+						Value: []byte("]"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  4,
 							EndPos:    5,
 						},
 					},
-					Items: []ast.Vertex{},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  5,
+						EndPos:    6,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19684,45 +44106,77 @@ func TestExprShortArray_Item(t *testing.T) {
 	src := `<? [1];`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprArray{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(91),
+						Value: []byte("["),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    6,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Items: []ast.Vertex{
 						&ast.ExprArrayItem{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    5,
+							},
+							Val: &ast.ScalarLnumber{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  4,
 									EndPos:    5,
 								},
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
+								NumberTkn: &token.Token{
+									ID:    token.T_LNUMBER,
+									Value: []byte("1"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -19734,17 +44188,36 @@ func TestExprShortArray_Item(t *testing.T) {
 							},
 						},
 					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(93),
+						Value: []byte("]"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  5,
+							EndPos:    6,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19752,45 +44225,77 @@ func TestExprShortArray_Items(t *testing.T) {
 	src := `<? [1=>1, &$b,];`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    16,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    16,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    16,
+				},
+				Expr: &ast.ExprArray{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    16,
+						EndPos:    15,
 					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(91),
+						Value: []byte("["),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    15,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Items: []ast.Vertex{
 						&ast.ExprArrayItem{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    8,
+							},
+							Key: &ast.ScalarLnumber{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  4,
-									EndPos:    8,
+									EndPos:    5,
 								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
+								NumberTkn: &token.Token{
+									ID:    token.T_LNUMBER,
+									Value: []byte("1"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -19800,8 +44305,26 @@ func TestExprShortArray_Items(t *testing.T) {
 								},
 								Value: []byte("1"),
 							},
+							DoubleArrowTkn: &token.Token{
+								ID:    token.T_DOUBLE_ARROW,
+								Value: []byte("=>"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    7,
+								},
+							},
 							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  7,
+									EndPos:    8,
+								},
+								NumberTkn: &token.Token{
+									ID:    token.T_LNUMBER,
+									Value: []byte("1"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -19813,34 +44336,58 @@ func TestExprShortArray_Items(t *testing.T) {
 							},
 						},
 						&ast.ExprArrayItem{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  10,
+								EndPos:    13,
+							},
+							Val: &ast.ExprReference{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  10,
 									EndPos:    13,
 								},
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
+								AmpersandTkn: &token.Token{
+									ID:    token.ID(38),
+									Value: []byte("&"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  10,
-										EndPos:    13,
+										EndPos:    11,
+									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  9,
+												EndPos:    10,
+											},
+										},
 									},
 								},
 								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  11,
+										EndPos:    13,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  11,
 											EndPos:    13,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$b"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -19855,17 +44402,58 @@ func TestExprShortArray_Items(t *testing.T) {
 						},
 						&ast.ExprArrayItem{},
 					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    14,
+							},
+						},
+					},
+					CloseBracketTkn: &token.Token{
+						ID:    token.ID(93),
+						Value: []byte("]"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    15,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19873,63 +44461,91 @@ func TestExprShortList(t *testing.T) {
 	src := `<? [$a] = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    7,
 						},
-					},
-					Var: &ast.ExprShortList{
-						Node: ast.Node{
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(91),
+							Value: []byte("["),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    7,
+								EndPos:    4,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
 							},
 						},
 						Items: []ast.Vertex{
 							&ast.ExprArrayItem{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    6,
+								},
+								Val: &ast.ExprVariable{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  4,
 										EndPos:    6,
 									},
-								},
-								Val: &ast.ExprVariable{
-									Node: ast.Node{
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  4,
 											EndPos:    6,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$a"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
@@ -19942,39 +44558,98 @@ func TestExprShortList(t *testing.T) {
 								},
 							},
 						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(93),
+							Value: []byte("]"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  6,
+								EndPos:    7,
+							},
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  7,
+									EndPos:    8,
+								},
+							},
+						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    12,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  10,
 								EndPos:    12,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  10,
 									EndPos:    12,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  9,
+											EndPos:    10,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19982,72 +44657,98 @@ func TestExprShortList_ArrayIndex(t *testing.T) {
 	src := `<? [$a[]] = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    14,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    14,
+							EndPos:    9,
 						},
-					},
-					Var: &ast.ExprShortList{
-						Node: ast.Node{
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(91),
+							Value: []byte("["),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    9,
+								EndPos:    4,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
 							},
 						},
 						Items: []ast.Vertex{
 							&ast.ExprArrayItem{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    8,
+								},
+								Val: &ast.ExprArrayDimFetch{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  4,
 										EndPos:    8,
 									},
-								},
-								Val: &ast.ExprArrayDimFetch{
-									Node: ast.Node{
+									Var: &ast.ExprVariable{
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  4,
-											EndPos:    8,
+											EndPos:    6,
 										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
+										VarName: &ast.Identifier{
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  4,
 												EndPos:    6,
 											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
+											IdentifierTkn: &token.Token{
+												ID:    token.T_VARIABLE,
+												Value: []byte("$a"),
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
@@ -20058,42 +44759,121 @@ func TestExprShortList_ArrayIndex(t *testing.T) {
 											Value: []byte("$a"),
 										},
 									},
+									OpenBracketTkn: &token.Token{
+										ID:    token.ID(91),
+										Value: []byte("["),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  6,
+											EndPos:    7,
+										},
+									},
+									CloseBracketTkn: &token.Token{
+										ID:    token.ID(93),
+										Value: []byte("]"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  7,
+											EndPos:    8,
+										},
+									},
+								},
+							},
+						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(93),
+							Value: []byte("]"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    9,
+							},
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    11,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  9,
+									EndPos:    10,
 								},
 							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    14,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  12,
 								EndPos:    14,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  12,
 									EndPos:    14,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  11,
+											EndPos:    12,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20101,82 +44881,126 @@ func TestExprShortList_List(t *testing.T) {
 	src := `<? [list($a)] = $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    19,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    19,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    19,
+				},
+				Expr: &ast.ExprAssign{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    19,
+						EndPos:    18,
 					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
+					Var: &ast.ExprList{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    18,
+							EndPos:    13,
 						},
-					},
-					Var: &ast.ExprShortList{
-						Node: ast.Node{
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(91),
+							Value: []byte("["),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    13,
+								EndPos:    4,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
 							},
 						},
 						Items: []ast.Vertex{
 							&ast.ExprArrayItem{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    12,
+								},
+								Val: &ast.ExprList{
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  4,
 										EndPos:    12,
 									},
-								},
-								Val: &ast.ExprList{
-									Node: ast.Node{
+									ListTkn: &token.Token{
+										ID:    token.T_LIST,
+										Value: []byte("list"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
 											StartPos:  4,
-											EndPos:    12,
+											EndPos:    8,
+										},
+									},
+									OpenBracketTkn: &token.Token{
+										ID:    token.ID(40),
+										Value: []byte("("),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  8,
+											EndPos:    9,
 										},
 									},
 									Items: []ast.Vertex{
 										&ast.ExprArrayItem{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  9,
+												EndPos:    11,
+											},
+											Val: &ast.ExprVariable{
 												Position: &position.Position{
 													StartLine: 1,
 													EndLine:   1,
 													StartPos:  9,
 													EndPos:    11,
 												},
-											},
-											Val: &ast.ExprVariable{
-												Node: ast.Node{
+												VarName: &ast.Identifier{
 													Position: &position.Position{
 														StartLine: 1,
 														EndLine:   1,
 														StartPos:  9,
 														EndPos:    11,
 													},
-												},
-												VarName: &ast.Identifier{
-													Node: ast.Node{
+													IdentifierTkn: &token.Token{
+														ID:    token.T_VARIABLE,
+														Value: []byte("$a"),
 														Position: &position.Position{
 															StartLine: 1,
 															EndLine:   1,
@@ -20189,42 +45013,111 @@ func TestExprShortList_List(t *testing.T) {
 											},
 										},
 									},
+									CloseBracketTkn: &token.Token{
+										ID:    token.ID(41),
+										Value: []byte(")"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  11,
+											EndPos:    12,
+										},
+									},
+								},
+							},
+						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(93),
+							Value: []byte("]"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
+							},
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    15,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    14,
 								},
 							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    18,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  16,
 								EndPos:    18,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  16,
 									EndPos:    18,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  15,
+											EndPos:    16,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  18,
+						EndPos:    19,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20232,58 +45125,98 @@ func TestExprStaticCall(t *testing.T) {
 	src := `<? Foo::bar();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				Expr: &ast.ExprStaticCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    13,
 					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
+					Class: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    13,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    6,
-							},
+							EndPos:    6,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  3,
+									EndPos:    6,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    6,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("Foo"),
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    8,
+						},
+					},
 					Call: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    11,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("bar"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -20293,27 +45226,46 @@ func TestExprStaticCall(t *testing.T) {
 						},
 						Value: []byte("bar"),
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  11,
-								EndPos:    13,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20321,45 +45273,87 @@ func TestExprStaticCall_Relative(t *testing.T) {
 	src := `<? namespace\Foo::bar();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    24,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    24,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    24,
+				},
+				Expr: &ast.ExprStaticCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    24,
+						EndPos:    23,
 					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
+					Class: &ast.NameRelative{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    23,
+							EndPos:    16,
 						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
+						NsTkn: &token.Token{
+							ID:    token.T_NAMESPACE,
+							Value: []byte("namespace"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    16,
+								EndPos:    12,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    16,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -20371,8 +45365,26 @@ func TestExprStaticCall_Relative(t *testing.T) {
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    18,
+						},
+					},
 					Call: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    21,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("bar"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -20382,27 +45394,46 @@ func TestExprStaticCall_Relative(t *testing.T) {
 						},
 						Value: []byte("bar"),
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  21,
-								EndPos:    23,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    22,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  22,
+							EndPos:    23,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  23,
+						EndPos:    24,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20410,45 +45441,77 @@ func TestExprStaticCall_FullyQualified(t *testing.T) {
 	src := `<? \Foo::bar();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				Expr: &ast.ExprStaticCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    14,
 					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
+					Class: &ast.NameFullyQualified{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    14,
+							EndPos:    7,
 						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    7,
+								EndPos:    4,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    7,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -20460,8 +45523,26 @@ func TestExprStaticCall_FullyQualified(t *testing.T) {
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    9,
+						},
+					},
 					Call: &ast.Identifier{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    12,
+						},
+						IdentifierTkn: &token.Token{
+							ID:    token.T_STRING,
+							Value: []byte("bar"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
@@ -20471,27 +45552,46 @@ func TestExprStaticCall_FullyQualified(t *testing.T) {
 						},
 						Value: []byte("bar"),
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  12,
-								EndPos:    14,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    14,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20499,67 +45599,105 @@ func TestExprStaticCall_Var(t *testing.T) {
 	src := `<? Foo::$bar();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    15,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    15,
+				},
+				Expr: &ast.ExprStaticCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    15,
+						EndPos:    14,
 					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
+					Class: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    14,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    6,
-							},
+							EndPos:    6,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  3,
+									EndPos:    6,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    6,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("Foo"),
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    8,
+						},
+					},
 					Call: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    12,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  8,
 								EndPos:    12,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -20570,27 +45708,46 @@ func TestExprStaticCall_Var(t *testing.T) {
 							Value: []byte("$bar"),
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  12,
-								EndPos:    14,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    13,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    14,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  14,
+						EndPos:    15,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20598,65 +45755,103 @@ func TestExprStaticCall_VarVar(t *testing.T) {
 	src := `<? $foo::$bar();`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    16,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    16,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    16,
+				},
+				Expr: &ast.ExprStaticCall{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    16,
+						EndPos:    15,
 					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
+					Class: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    15,
+							EndPos:    7,
 						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    7,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$foo"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    7,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$foo"),
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    9,
+						},
+					},
 					Call: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    13,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    13,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -20667,27 +45862,46 @@ func TestExprStaticCall_VarVar(t *testing.T) {
 							Value: []byte("$bar"),
 						},
 					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  13,
-								EndPos:    15,
-							},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    14,
 						},
 					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    15,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20695,67 +45909,105 @@ func TestExprStaticPropertyFetch(t *testing.T) {
 	src := `<? Foo::$bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ExprStaticPropertyFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
+					Class: &ast.NameName{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    6,
-							},
+							EndPos:    6,
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  3,
+									EndPos:    6,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    6,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("Foo"),
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    8,
+						},
+					},
 					Property: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    12,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  8,
 								EndPos:    12,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -20767,16 +46019,25 @@ func TestExprStaticPropertyFetch(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20784,45 +46045,87 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) {
 	src := `<? namespace\Foo::$bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    23,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    23,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    23,
+				},
+				Expr: &ast.ExprStaticPropertyFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    23,
+						EndPos:    22,
 					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
+					Class: &ast.NameRelative{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    22,
+							EndPos:    16,
 						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
+						NsTkn: &token.Token{
+							ID:    token.T_NAMESPACE,
+							Value: []byte("namespace"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    16,
+								EndPos:    12,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
+						},
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  12,
+								EndPos:    13,
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  13,
+									EndPos:    16,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -20834,17 +46137,33 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) {
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    18,
+						},
+					},
 					Property: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    22,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    22,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -20856,16 +46175,25 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  22,
+						EndPos:    23,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20873,45 +46201,77 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) {
 	src := `<? \Foo::$bar;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    14,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    14,
+				},
+				Expr: &ast.ExprStaticPropertyFetch{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    14,
+						EndPos:    13,
 					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
+					Class: &ast.NameFullyQualified{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    13,
+							EndPos:    7,
 						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
+						NsSeparatorTkn: &token.Token{
+							ID:    token.T_NS_SEPARATOR,
+							Value: []byte("\\"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    7,
+								EndPos:    4,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
 							},
 						},
 						Parts: []ast.Vertex{
 							&ast.NameNamePart{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  4,
+									EndPos:    7,
+								},
+								StringTkn: &token.Token{
+									ID:    token.T_STRING,
+									Value: []byte("Foo"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
@@ -20923,17 +46283,33 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) {
 							},
 						},
 					},
+					DoubleColonTkn: &token.Token{
+						ID:    token.T_PAAMAYIM_NEKUDOTAYIM,
+						Value: []byte("::"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  7,
+							EndPos:    9,
+						},
+					},
 					Property: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    13,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    13,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$bar"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -20945,16 +46321,25 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  13,
+						EndPos:    14,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -20962,107 +46347,218 @@ func TestExprTernary(t *testing.T) {
 	src := `<? $a ? $b : $c;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    16,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    16,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    16,
+				},
+				Expr: &ast.ExprTernary{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    16,
+						EndPos:    15,
 					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
+					Condition: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    15,
+							EndPos:    5,
 						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					QuestionTkn: &token.Token{
+						ID:    token.ID(63),
+						Value: []byte("?"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
+							},
+						},
+					},
 					IfTrue: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    10,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  8,
 								EndPos:    10,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
 									EndPos:    10,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  7,
+											EndPos:    8,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
+					ColonTkn: &token.Token{
+						ID:    token.ID(58),
+						Value: []byte(":"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  11,
+							EndPos:    12,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  10,
+									EndPos:    11,
+								},
+							},
+						},
+					},
 					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  13,
+							EndPos:    15,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  13,
 								EndPos:    15,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$c"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    15,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  12,
+											EndPos:    13,
+										},
+									},
+								},
 							},
 							Value: []byte("$c"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  15,
+						EndPos:    16,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21070,86 +46566,179 @@ func TestExprTernary_Simple(t *testing.T) {
 	src := `<? $a ? : $c;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    13,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    13,
+				},
+				Expr: &ast.ExprTernary{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    13,
+						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
+					Condition: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    12,
+							EndPos:    5,
 						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					QuestionTkn: &token.Token{
+						ID:    token.ID(63),
+						Value: []byte("?"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
+							},
+						},
+					},
+					ColonTkn: &token.Token{
+						ID:    token.ID(58),
+						Value: []byte(":"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    9,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  7,
+									EndPos:    8,
+								},
+							},
+						},
+					},
 					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  10,
+							EndPos:    12,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  10,
 								EndPos:    12,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$c"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  10,
 									EndPos:    12,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  9,
+											EndPos:    10,
+										},
+									},
+								},
 							},
 							Value: []byte("$c"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21157,159 +46746,348 @@ func TestExprTernary_NestedTrue(t *testing.T) {
 	src := `<? $a ? $b ? $c : $d : $e;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    26,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    26,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				Expr: &ast.ExprTernary{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    26,
+						EndPos:    25,
 					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
+					Condition: &ast.ExprVariable{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    25,
+							EndPos:    5,
 						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  2,
+											EndPos:    3,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					QuestionTkn: &token.Token{
+						ID:    token.ID(63),
+						Value: []byte("?"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  6,
+							EndPos:    7,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
+							},
+						},
+					},
 					IfTrue: &ast.ExprTernary{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  8,
+							EndPos:    20,
+						},
+						Condition: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  8,
-								EndPos:    20,
+								EndPos:    10,
 							},
-						},
-						Condition: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
 									EndPos:    10,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
 										EndPos:    10,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  7,
+												EndPos:    8,
+											},
+										},
+									},
 								},
 								Value: []byte("$b"),
 							},
 						},
+						QuestionTkn: &token.Token{
+							ID:    token.ID(63),
+							Value: []byte("?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  11,
+								EndPos:    12,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  10,
+										EndPos:    11,
+									},
+								},
+							},
+						},
 						IfTrue: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    15,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    15,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$c"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  13,
 										EndPos:    15,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  12,
+												EndPos:    13,
+											},
+										},
+									},
 								},
 								Value: []byte("$c"),
 							},
 						},
+						ColonTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  16,
+								EndPos:    17,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  15,
+										EndPos:    16,
+									},
+								},
+							},
+						},
 						IfFalse: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  18,
+								EndPos:    20,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  18,
 									EndPos:    20,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$d"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  18,
 										EndPos:    20,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  17,
+												EndPos:    18,
+											},
+										},
+									},
 								},
 								Value: []byte("$d"),
 							},
 						},
 					},
+					ColonTkn: &token.Token{
+						ID:    token.ID(58),
+						Value: []byte(":"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    22,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  20,
+									EndPos:    21,
+								},
+							},
+						},
+					},
 					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    25,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  23,
 								EndPos:    25,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$e"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  23,
 									EndPos:    25,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  22,
+											EndPos:    23,
+										},
+									},
+								},
 							},
 							Value: []byte("$e"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  25,
+						EndPos:    26,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21317,159 +47095,348 @@ func TestExprTernary_NestedCond(t *testing.T) {
 	src := `<? $a ? $b : $c ? $d : $e;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    26,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    26,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				Expr: &ast.ExprTernary{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    26,
+						EndPos:    25,
 					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
+					Condition: &ast.ExprTernary{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    25,
+							EndPos:    15,
 						},
-					},
-					Condition: &ast.ExprTernary{
-						Node: ast.Node{
+						Condition: &ast.ExprVariable{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
-								EndPos:    15,
+								EndPos:    5,
 							},
-						},
-						Condition: &ast.ExprVariable{
-							Node: ast.Node{
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  3,
 									EndPos:    5,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$a"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  3,
 										EndPos:    5,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_OPEN_TAG,
+											Value: []byte("<?"),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  0,
+												EndPos:    2,
+											},
+										},
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  2,
+												EndPos:    3,
+											},
+										},
+									},
 								},
 								Value: []byte("$a"),
 							},
 						},
+						QuestionTkn: &token.Token{
+							ID:    token.ID(63),
+							Value: []byte("?"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  6,
+								EndPos:    7,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  5,
+										EndPos:    6,
+									},
+								},
+							},
+						},
 						IfTrue: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  8,
+								EndPos:    10,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  8,
 									EndPos:    10,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$b"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  8,
 										EndPos:    10,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  7,
+												EndPos:    8,
+											},
+										},
+									},
 								},
 								Value: []byte("$b"),
 							},
 						},
+						ColonTkn: &token.Token{
+							ID:    token.ID(58),
+							Value: []byte(":"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  11,
+								EndPos:    12,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  10,
+										EndPos:    11,
+									},
+								},
+							},
+						},
 						IfFalse: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  13,
+								EndPos:    15,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  13,
 									EndPos:    15,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$c"),
 									Position: &position.Position{
 										StartLine: 1,
 										EndLine:   1,
 										StartPos:  13,
 										EndPos:    15,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 1,
+												EndLine:   1,
+												StartPos:  12,
+												EndPos:    13,
+											},
+										},
+									},
 								},
 								Value: []byte("$c"),
 							},
 						},
 					},
+					QuestionTkn: &token.Token{
+						ID:    token.ID(63),
+						Value: []byte("?"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  16,
+							EndPos:    17,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  15,
+									EndPos:    16,
+								},
+							},
+						},
+					},
 					IfTrue: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  18,
+							EndPos:    20,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  18,
 								EndPos:    20,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$d"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  18,
 									EndPos:    20,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  17,
+											EndPos:    18,
+										},
+									},
+								},
 							},
 							Value: []byte("$d"),
 						},
 					},
+					ColonTkn: &token.Token{
+						ID:    token.ID(58),
+						Value: []byte(":"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  21,
+							EndPos:    22,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  20,
+									EndPos:    21,
+								},
+							},
+						},
+					},
 					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  23,
+							EndPos:    25,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  23,
 								EndPos:    25,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$e"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  23,
 									EndPos:    25,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  22,
+											EndPos:    23,
+										},
+									},
+								},
 							},
 							Value: []byte("$e"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  25,
+						EndPos:    26,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21477,44 +47444,76 @@ func TestExprUnaryMinus(t *testing.T) {
 	src := `<? -$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprUnaryMinus{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprUnaryMinus{
-					Node: ast.Node{
+					MinusTkn: &token.Token{
+						ID:    token.ID(45),
+						Value: []byte("-"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    6,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  4,
+							EndPos:    6,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  4,
 								EndPos:    6,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -21526,16 +47525,25 @@ func TestExprUnaryMinus(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21543,44 +47551,76 @@ func TestExprUnaryPlus(t *testing.T) {
 	src := `<? +$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprUnaryPlus{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprUnaryPlus{
-					Node: ast.Node{
+					PlusTkn: &token.Token{
+						ID:    token.ID(43),
+						Value: []byte("+"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    6,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  4,
+							EndPos:    6,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  4,
 								EndPos:    6,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -21592,16 +47632,25 @@ func TestExprUnaryPlus(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21609,55 +47658,88 @@ func TestExprVariable(t *testing.T) {
 	src := `<? $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    6,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    6,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    6,
+				},
+				Expr: &ast.ExprVariable{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    6,
+						EndPos:    5,
 					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					VarName: &ast.Identifier{
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    5,
 						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
+						IdentifierTkn: &token.Token{
+							ID:    token.T_VARIABLE,
+							Value: []byte("$a"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  3,
 								EndPos:    5,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_OPEN_TAG,
+									Value: []byte("<?"),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  0,
+										EndPos:    2,
+									},
+								},
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  2,
+										EndPos:    3,
+									},
+								},
+							},
 						},
 						Value: []byte("$a"),
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  5,
+						EndPos:    6,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21665,44 +47747,76 @@ func TestExprVariable_Variable(t *testing.T) {
 	src := `<? $$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    7,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    7,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    7,
+				},
+				Expr: &ast.ExprVariable{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    7,
+						EndPos:    6,
 					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
+					DollarTkn: &token.Token{
+						ID:    token.ID(36),
+						Value: []byte("$"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    6,
+							EndPos:    4,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					VarName: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  4,
+							EndPos:    6,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  4,
 								EndPos:    6,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
@@ -21714,16 +47828,25 @@ func TestExprVariable_Variable(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  6,
+						EndPos:    7,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21731,44 +47854,79 @@ func TestExprYield(t *testing.T) {
 	src := `<? yield;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    9,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    9,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    9,
+				},
+				Expr: &ast.ExprYield{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    9,
+						EndPos:    8,
 					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
+					YieldTkn: &token.Token{
+						ID:    token.T_YIELD,
+						Value: []byte("yield"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
 							EndPos:    8,
 						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  8,
+						EndPos:    9,
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21776,65 +47934,118 @@ func TestExprYield_Val(t *testing.T) {
 	src := `<? yield $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    12,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    12,
+				},
+				Expr: &ast.ExprYield{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    12,
+						EndPos:    11,
 					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
+					YieldTkn: &token.Token{
+						ID:    token.T_YIELD,
+						Value: []byte("yield"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    11,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Value: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  8,
+											EndPos:    9,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  11,
+						EndPos:    12,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21842,86 +48053,179 @@ func TestExprYield_KeyVal(t *testing.T) {
 	src := `<? yield $a => $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    18,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    18,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    18,
+				},
+				Expr: &ast.ExprYield{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    18,
+						EndPos:    17,
 					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
+					YieldTkn: &token.Token{
+						ID:    token.T_YIELD,
+						Value: []byte("yield"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    17,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Key: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  8,
+											EndPos:    9,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					DoubleArrowTkn: &token.Token{
+						ID:    token.T_DOUBLE_ARROW,
+						Value: []byte("=>"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    14,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  11,
+									EndPos:    12,
+								},
+							},
+						},
+					},
 					Value: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    17,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
 								EndPos:    17,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  15,
 									EndPos:    17,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  14,
+											EndPos:    15,
+										},
+									},
+								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  17,
+						EndPos:    18,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21929,55 +48233,110 @@ func TestExprYield_Expr(t *testing.T) {
 	src := `<? yield 1;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    11,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    11,
+				},
+				Expr: &ast.ExprYield{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    11,
+						EndPos:    10,
 					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
+					YieldTkn: &token.Token{
+						ID:    token.T_YIELD,
+						Value: []byte("yield"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    10,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Value: &ast.ScalarLnumber{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    10,
+						},
+						NumberTkn: &token.Token{
+							ID:    token.T_LNUMBER,
+							Value: []byte("1"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    10,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  8,
+										EndPos:    9,
+									},
+								},
+							},
 						},
 						Value: []byte("1"),
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  10,
+						EndPos:    11,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -21985,76 +48344,171 @@ func TestExprYield_KeyExpr(t *testing.T) {
 	src := `<? yield $a => 1;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				Expr: &ast.ExprYield{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    16,
 					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
+					YieldTkn: &token.Token{
+						ID:    token.T_YIELD,
+						Value: []byte("yield"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    16,
+							EndPos:    8,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Key: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  9,
+							EndPos:    11,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  9,
 								EndPos:    11,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  9,
 									EndPos:    11,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  8,
+											EndPos:    9,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					DoubleArrowTkn: &token.Token{
+						ID:    token.T_DOUBLE_ARROW,
+						Value: []byte("=>"),
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  12,
+							EndPos:    14,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  11,
+									EndPos:    12,
+								},
+							},
+						},
+					},
 					Value: &ast.ScalarLnumber{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  15,
+							EndPos:    16,
+						},
+						NumberTkn: &token.Token{
+							ID:    token.T_LNUMBER,
+							Value: []byte("1"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  15,
 								EndPos:    16,
 							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  14,
+										EndPos:    15,
+									},
+								},
+							},
 						},
 						Value: []byte("1"),
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -22062,4082 +48516,6018 @@ func TestExprYieldFrom(t *testing.T) {
 	src := `<? yield from $a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    17,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    17,
+				},
+				Expr: &ast.ExprYieldFrom{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    17,
+						EndPos:    16,
 					},
-				},
-				Expr: &ast.ExprYieldFrom{
-					Node: ast.Node{
+					YieldFromTkn: &token.Token{
+						ID:    token.T_YIELD_FROM,
+						Value: []byte("yield from"),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
 							StartPos:  3,
-							EndPos:    16,
+							EndPos:    13,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  2,
+									EndPos:    3,
+								},
+							},
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    16,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  14,
 								EndPos:    16,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  14,
 									EndPos:    16,
 								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  13,
+											EndPos:    14,
+										},
+									},
+								},
 							},
 							Value: []byte("$a"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  16,
+						EndPos:    17,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 // expr assign
 
 func TestExprAssign_Assign(t *testing.T) {
-	src := `<? $a = $b;`
+	src := `<?
+		$a = $b;
+		$a =& $b;
+		$a =& new Foo;
+		$a =& new Foo($b);
+		$a &= $b;
+		$a |= $b;
+		$a ^= $b;
+		$a .= $b;
+		$a /= $b;
+		$a -= $b;
+		$a %= $b;
+		$a *= $b;
+		$a += $b;
+		$a **= $b;
+		$a <<= $b;
+		$a >>= $b;
+		$a ??= $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   18,
+			StartPos:  5,
+			EndPos:    223,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
-					},
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    13,
 				},
 				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Reference(t *testing.T) {
-	src := `<? $a =& $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  5,
 						EndPos:    12,
 					},
-				},
-				Expr: &ast.ExprAssignReference{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
-					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_ReferenceNew(t *testing.T) {
-	src := `<? $a =& new Foo;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    17,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    17,
-					},
-				},
-				Expr: &ast.ExprAssignReference{
-					Node: ast.Node{
 						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    16,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  5,
+							EndPos:    7,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprNew{
-						Node: ast.Node{
 							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    16,
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  5,
+								EndPos:    7,
 							},
-						},
-						Class: &ast.NameName{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  13,
-									EndPos:    16,
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  5,
+									EndPos:    7,
 								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
 										Position: &position.Position{
 											StartLine: 1,
 											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   2,
+											StartPos:  2,
+											EndPos:    5,
+										},
+									},
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  8,
+							EndPos:    9,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  7,
+									EndPos:    8,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  10,
+							EndPos:    12,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  10,
+								EndPos:    12,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  10,
+									EndPos:    12,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  9,
+											EndPos:    10,
+										},
+									},
+								},
+							},
+							Value: []byte("$b"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  12,
+						EndPos:    13,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 3,
+					EndLine:   3,
+					StartPos:  16,
+					EndPos:    25,
+				},
+				Expr: &ast.ExprAssignReference{
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  16,
+						EndPos:    24,
+					},
+					Var: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  16,
+							EndPos:    18,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  16,
+								EndPos:    18,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  16,
+									EndPos:    18,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   3,
 											StartPos:  13,
 											EndPos:    16,
 										},
 									},
-									Value: []byte("Foo"),
 								},
 							},
+							Value: []byte("$a"),
 						},
 					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_ReferenceArgs(t *testing.T) {
-	src := `<? $a =& new Foo($b);`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    21,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    21,
-					},
-				},
-				Expr: &ast.ExprAssignReference{
-					Node: ast.Node{
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
 						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  19,
 							EndPos:    20,
 						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  18,
+									EndPos:    19,
+								},
 							},
 						},
+					},
+					AmpersandTkn: &token.Token{
+						ID:    token.ID(38),
+						Value: []byte("&"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  20,
+							EndPos:    21,
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  22,
+							EndPos:    24,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  22,
+								EndPos:    24,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  22,
+									EndPos:    24,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  21,
+											EndPos:    22,
+										},
+									},
+								},
+							},
+							Value: []byte("$b"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  24,
+						EndPos:    25,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 4,
+					EndLine:   4,
+					StartPos:  28,
+					EndPos:    42,
+				},
+				Expr: &ast.ExprAssignReference{
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   -1,
+						StartPos:  28,
+						EndPos:    -1,
+					},
+					Var: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  28,
+							EndPos:    30,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  28,
+								EndPos:    30,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  28,
+									EndPos:    30,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   4,
+											StartPos:  25,
+											EndPos:    28,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  31,
+							EndPos:    32,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  30,
+									EndPos:    31,
+								},
+							},
+						},
+					},
+					AmpersandTkn: &token.Token{
+						ID:    token.ID(38),
+						Value: []byte("&"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  32,
+							EndPos:    33,
+						},
+					},
 					Expr: &ast.ExprNew{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   -1,
+							StartPos:  34,
+							EndPos:    -1,
+						},
+						NewTkn: &token.Token{
+							ID:    token.T_NEW,
+							Value: []byte("new"),
 							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    20,
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  34,
+								EndPos:    37,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  33,
+										EndPos:    34,
+									},
+								},
 							},
 						},
 						Class: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  13,
-									EndPos:    16,
-								},
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  38,
+								EndPos:    41,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  38,
+										EndPos:    41,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
 										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  13,
-											EndPos:    16,
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  38,
+											EndPos:    41,
+										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 4,
+													EndLine:   4,
+													StartPos:  37,
+													EndPos:    38,
+												},
+											},
 										},
 									},
 									Value: []byte("Foo"),
 								},
 							},
 						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  16,
-									EndPos:    20,
-								},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  41,
+						EndPos:    42,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 5,
+					EndLine:   5,
+					StartPos:  45,
+					EndPos:    63,
+				},
+				Expr: &ast.ExprAssignReference{
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  45,
+						EndPos:    62,
+					},
+					Var: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  45,
+							EndPos:    47,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  45,
+								EndPos:    47,
 							},
-							Arguments: []ast.Vertex{
-								&ast.Argument{
-									Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  45,
+									EndPos:    47,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
 										Position: &position.Position{
-											StartLine: 1,
-											EndLine:   1,
-											StartPos:  17,
-											EndPos:    19,
+											StartLine: 4,
+											EndLine:   5,
+											StartPos:  42,
+											EndPos:    45,
 										},
 									},
-									Variadic:    false,
-									IsReference: false,
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 1,
-												EndLine:   1,
-												StartPos:  17,
-												EndPos:    19,
-											},
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+					EqualTkn: &token.Token{
+						ID:    token.ID(61),
+						Value: []byte("="),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  48,
+							EndPos:    49,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  47,
+									EndPos:    48,
+								},
+							},
+						},
+					},
+					AmpersandTkn: &token.Token{
+						ID:    token.ID(38),
+						Value: []byte("&"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  49,
+							EndPos:    50,
+						},
+					},
+					Expr: &ast.ExprNew{
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  51,
+							EndPos:    62,
+						},
+						NewTkn: &token.Token{
+							ID:    token.T_NEW,
+							Value: []byte("new"),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  51,
+								EndPos:    54,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 5,
+										EndLine:   5,
+										StartPos:  50,
+										EndPos:    51,
+									},
+								},
+							},
+						},
+						Class: &ast.NameName{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  55,
+								EndPos:    58,
+							},
+							Parts: []ast.Vertex{
+								&ast.NameNamePart{
+									Position: &position.Position{
+										StartLine: 5,
+										EndLine:   5,
+										StartPos:  55,
+										EndPos:    58,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("Foo"),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  55,
+											EndPos:    58,
 										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
 												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  17,
-													EndPos:    19,
+													StartLine: 5,
+													EndLine:   5,
+													StartPos:  54,
+													EndPos:    55,
 												},
 											},
-											Value: []byte("$b"),
 										},
 									},
+									Value: []byte("Foo"),
+								},
+							},
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  58,
+								EndPos:    59,
+							},
+						},
+						Arguments: []ast.Vertex{
+							&ast.Argument{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  59,
+									EndPos:    61,
+								},
+								Expr: &ast.ExprVariable{
+									Position: &position.Position{
+										StartLine: 5,
+										EndLine:   5,
+										StartPos:  59,
+										EndPos:    61,
+									},
+									VarName: &ast.Identifier{
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  59,
+											EndPos:    61,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$b"),
+											Position: &position.Position{
+												StartLine: 5,
+												EndLine:   5,
+												StartPos:  59,
+												EndPos:    61,
+											},
+										},
+										Value: []byte("$b"),
+									},
 								},
 							},
 						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  61,
+								EndPos:    62,
+							},
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  62,
+						EndPos:    63,
 					},
 				},
 			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_BitwiseAnd(t *testing.T) {
-	src := `<? $a &= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
-					},
+				Position: &position.Position{
+					StartLine: 6,
+					EndLine:   6,
+					StartPos:  66,
+					EndPos:    75,
 				},
 				Expr: &ast.ExprAssignBitwiseAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  66,
+						EndPos:    74,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  66,
+							EndPos:    68,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 6,
+								EndLine:   6,
+								StartPos:  66,
+								EndPos:    68,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  66,
+									EndPos:    68,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   6,
+											StartPos:  63,
+											EndPos:    66,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_AND_EQUAL,
+						Value: []byte("&="),
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  69,
+							EndPos:    71,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  68,
+									EndPos:    69,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  72,
+							EndPos:    74,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 6,
+								EndLine:   6,
+								StartPos:  72,
+								EndPos:    74,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  72,
+									EndPos:    74,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 6,
+											EndLine:   6,
+											StartPos:  71,
+											EndPos:    72,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_BitwiseOr(t *testing.T) {
-	src := `<? $a |= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  74,
+						EndPos:    75,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 7,
+					EndLine:   7,
+					StartPos:  78,
+					EndPos:    87,
+				},
 				Expr: &ast.ExprAssignBitwiseOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  78,
+						EndPos:    86,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  78,
+							EndPos:    80,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 7,
+								EndLine:   7,
+								StartPos:  78,
+								EndPos:    80,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  78,
+									EndPos:    80,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 6,
+											EndLine:   7,
+											StartPos:  75,
+											EndPos:    78,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_OR_EQUAL,
+						Value: []byte("|="),
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  81,
+							EndPos:    83,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  80,
+									EndPos:    81,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  84,
+							EndPos:    86,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 7,
+								EndLine:   7,
+								StartPos:  84,
+								EndPos:    86,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  84,
+									EndPos:    86,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   7,
+											StartPos:  83,
+											EndPos:    84,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_BitwiseXor(t *testing.T) {
-	src := `<? $a ^= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  86,
+						EndPos:    87,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 8,
+					EndLine:   8,
+					StartPos:  90,
+					EndPos:    99,
+				},
 				Expr: &ast.ExprAssignBitwiseXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 8,
+						EndLine:   8,
+						StartPos:  90,
+						EndPos:    98,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  90,
+							EndPos:    92,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 8,
+								EndLine:   8,
+								StartPos:  90,
+								EndPos:    92,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  90,
+									EndPos:    92,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   8,
+											StartPos:  87,
+											EndPos:    90,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_XOR_EQUAL,
+						Value: []byte("^="),
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  93,
+							EndPos:    95,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  92,
+									EndPos:    93,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  96,
+							EndPos:    98,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 8,
+								EndLine:   8,
+								StartPos:  96,
+								EndPos:    98,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  96,
+									EndPos:    98,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 8,
+											EndLine:   8,
+											StartPos:  95,
+											EndPos:    96,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Concat(t *testing.T) {
-	src := `<? $a .= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 8,
+						EndLine:   8,
+						StartPos:  98,
+						EndPos:    99,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 9,
+					EndLine:   9,
+					StartPos:  102,
+					EndPos:    111,
+				},
 				Expr: &ast.ExprAssignConcat{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  102,
+						EndPos:    110,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  102,
+							EndPos:    104,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  102,
+								EndPos:    104,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  102,
+									EndPos:    104,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 8,
+											EndLine:   9,
+											StartPos:  99,
+											EndPos:    102,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_CONCAT_EQUAL,
+						Value: []byte(".="),
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  105,
+							EndPos:    107,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  104,
+									EndPos:    105,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  108,
+							EndPos:    110,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  108,
+								EndPos:    110,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  108,
+									EndPos:    110,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 9,
+											EndLine:   9,
+											StartPos:  107,
+											EndPos:    108,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Div(t *testing.T) {
-	src := `<? $a /= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  110,
+						EndPos:    111,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 10,
+					EndLine:   10,
+					StartPos:  114,
+					EndPos:    123,
+				},
 				Expr: &ast.ExprAssignDiv{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 10,
+						EndLine:   10,
+						StartPos:  114,
+						EndPos:    122,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  114,
+							EndPos:    116,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 10,
+								EndLine:   10,
+								StartPos:  114,
+								EndPos:    116,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 10,
+									EndLine:   10,
+									StartPos:  114,
+									EndPos:    116,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 9,
+											EndLine:   10,
+											StartPos:  111,
+											EndPos:    114,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_DIV_EQUAL,
+						Value: []byte("/="),
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  117,
+							EndPos:    119,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 10,
+									EndLine:   10,
+									StartPos:  116,
+									EndPos:    117,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  120,
+							EndPos:    122,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 10,
+								EndLine:   10,
+								StartPos:  120,
+								EndPos:    122,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 10,
+									EndLine:   10,
+									StartPos:  120,
+									EndPos:    122,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 10,
+											EndLine:   10,
+											StartPos:  119,
+											EndPos:    120,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Minus(t *testing.T) {
-	src := `<? $a -= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 10,
+						EndLine:   10,
+						StartPos:  122,
+						EndPos:    123,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 11,
+					EndLine:   11,
+					StartPos:  126,
+					EndPos:    135,
+				},
 				Expr: &ast.ExprAssignMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 11,
+						EndLine:   11,
+						StartPos:  126,
+						EndPos:    134,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  126,
+							EndPos:    128,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  126,
+								EndPos:    128,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  126,
+									EndPos:    128,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 10,
+											EndLine:   11,
+											StartPos:  123,
+											EndPos:    126,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_MINUS_EQUAL,
+						Value: []byte("-="),
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  129,
+							EndPos:    131,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  128,
+									EndPos:    129,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  132,
+							EndPos:    134,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  132,
+								EndPos:    134,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  132,
+									EndPos:    134,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 11,
+											EndLine:   11,
+											StartPos:  131,
+											EndPos:    132,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Mod(t *testing.T) {
-	src := `<? $a %= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 11,
+						EndLine:   11,
+						StartPos:  134,
+						EndPos:    135,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 12,
+					EndLine:   12,
+					StartPos:  138,
+					EndPos:    147,
+				},
 				Expr: &ast.ExprAssignMod{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 12,
+						EndLine:   12,
+						StartPos:  138,
+						EndPos:    146,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  138,
+							EndPos:    140,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 12,
+								EndLine:   12,
+								StartPos:  138,
+								EndPos:    140,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  138,
+									EndPos:    140,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 11,
+											EndLine:   12,
+											StartPos:  135,
+											EndPos:    138,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_MOD_EQUAL,
+						Value: []byte("%="),
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  141,
+							EndPos:    143,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  140,
+									EndPos:    141,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  144,
+							EndPos:    146,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 12,
+								EndLine:   12,
+								StartPos:  144,
+								EndPos:    146,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  144,
+									EndPos:    146,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 12,
+											EndLine:   12,
+											StartPos:  143,
+											EndPos:    144,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Mul(t *testing.T) {
-	src := `<? $a *= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 12,
+						EndLine:   12,
+						StartPos:  146,
+						EndPos:    147,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 13,
+					EndLine:   13,
+					StartPos:  150,
+					EndPos:    159,
+				},
 				Expr: &ast.ExprAssignMul{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 13,
+						EndLine:   13,
+						StartPos:  150,
+						EndPos:    158,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 13,
+							EndLine:   13,
+							StartPos:  150,
+							EndPos:    152,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 13,
+								EndLine:   13,
+								StartPos:  150,
+								EndPos:    152,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 13,
+									EndLine:   13,
+									StartPos:  150,
+									EndPos:    152,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 12,
+											EndLine:   13,
+											StartPos:  147,
+											EndPos:    150,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_MUL_EQUAL,
+						Value: []byte("*="),
+						Position: &position.Position{
+							StartLine: 13,
+							EndLine:   13,
+							StartPos:  153,
+							EndPos:    155,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 13,
+									EndLine:   13,
+									StartPos:  152,
+									EndPos:    153,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 13,
+							EndLine:   13,
+							StartPos:  156,
+							EndPos:    158,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 13,
+								EndLine:   13,
+								StartPos:  156,
+								EndPos:    158,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 13,
+									EndLine:   13,
+									StartPos:  156,
+									EndPos:    158,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 13,
+											EndLine:   13,
+											StartPos:  155,
+											EndPos:    156,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Plus(t *testing.T) {
-	src := `<? $a += $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 13,
+						EndLine:   13,
+						StartPos:  158,
+						EndPos:    159,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 14,
+					EndLine:   14,
+					StartPos:  162,
+					EndPos:    171,
+				},
 				Expr: &ast.ExprAssignPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 14,
+						EndLine:   14,
+						StartPos:  162,
+						EndPos:    170,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 14,
+							EndLine:   14,
+							StartPos:  162,
+							EndPos:    164,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 14,
+								EndLine:   14,
+								StartPos:  162,
+								EndPos:    164,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 14,
+									EndLine:   14,
+									StartPos:  162,
+									EndPos:    164,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 13,
+											EndLine:   14,
+											StartPos:  159,
+											EndPos:    162,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					EqualTkn: &token.Token{
+						ID:    token.T_PLUS_EQUAL,
+						Value: []byte("+="),
+						Position: &position.Position{
+							StartLine: 14,
+							EndLine:   14,
+							StartPos:  165,
+							EndPos:    167,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 14,
+									EndLine:   14,
+									StartPos:  164,
+									EndPos:    165,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 14,
+							EndLine:   14,
+							StartPos:  168,
+							EndPos:    170,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 14,
+								EndLine:   14,
+								StartPos:  168,
+								EndPos:    170,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 14,
+									EndLine:   14,
+									StartPos:  168,
+									EndPos:    170,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 14,
+											EndLine:   14,
+											StartPos:  167,
+											EndPos:    168,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Pow(t *testing.T) {
-	src := `<? $a **= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 14,
+						EndLine:   14,
+						StartPos:  170,
+						EndPos:    171,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 15,
+					EndLine:   15,
+					StartPos:  174,
+					EndPos:    184,
+				},
 				Expr: &ast.ExprAssignPow{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 15,
+						EndLine:   15,
+						StartPos:  174,
+						EndPos:    183,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 15,
+							EndLine:   15,
+							StartPos:  174,
+							EndPos:    176,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 15,
+								EndLine:   15,
+								StartPos:  174,
+								EndPos:    176,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 15,
+									EndLine:   15,
+									StartPos:  174,
+									EndPos:    176,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 14,
+											EndLine:   15,
+											StartPos:  171,
+											EndPos:    174,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					EqualTkn: &token.Token{
+						ID:    token.T_POW_EQUAL,
+						Value: []byte("**="),
+						Position: &position.Position{
+							StartLine: 15,
+							EndLine:   15,
+							StartPos:  177,
+							EndPos:    180,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 15,
+									EndLine:   15,
+									StartPos:  176,
+									EndPos:    177,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 15,
+							EndLine:   15,
+							StartPos:  181,
+							EndPos:    183,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 15,
+								EndLine:   15,
+								StartPos:  181,
+								EndPos:    183,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 15,
+									EndLine:   15,
+									StartPos:  181,
+									EndPos:    183,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 15,
+											EndLine:   15,
+											StartPos:  180,
+											EndPos:    181,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_ShiftLeft(t *testing.T) {
-	src := `<? $a <<= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 15,
+						EndLine:   15,
+						StartPos:  183,
+						EndPos:    184,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 16,
+					EndLine:   16,
+					StartPos:  187,
+					EndPos:    197,
+				},
 				Expr: &ast.ExprAssignShiftLeft{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 16,
+						EndLine:   16,
+						StartPos:  187,
+						EndPos:    196,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 16,
+							EndLine:   16,
+							StartPos:  187,
+							EndPos:    189,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 16,
+								EndLine:   16,
+								StartPos:  187,
+								EndPos:    189,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 16,
+									EndLine:   16,
+									StartPos:  187,
+									EndPos:    189,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 15,
+											EndLine:   16,
+											StartPos:  184,
+											EndPos:    187,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					EqualTkn: &token.Token{
+						ID:    token.T_SL_EQUAL,
+						Value: []byte("<<="),
+						Position: &position.Position{
+							StartLine: 16,
+							EndLine:   16,
+							StartPos:  190,
+							EndPos:    193,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 16,
+									EndLine:   16,
+									StartPos:  189,
+									EndPos:    190,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 16,
+							EndLine:   16,
+							StartPos:  194,
+							EndPos:    196,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 16,
+								EndLine:   16,
+								StartPos:  194,
+								EndPos:    196,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 16,
+									EndLine:   16,
+									StartPos:  194,
+									EndPos:    196,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 16,
+											EndLine:   16,
+											StartPos:  193,
+											EndPos:    194,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_ShiftRight(t *testing.T) {
-	src := `<? $a >>= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 16,
+						EndLine:   16,
+						StartPos:  196,
+						EndPos:    197,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 17,
+					EndLine:   17,
+					StartPos:  200,
+					EndPos:    210,
+				},
 				Expr: &ast.ExprAssignShiftRight{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 17,
+						EndLine:   17,
+						StartPos:  200,
+						EndPos:    209,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 17,
+							EndLine:   17,
+							StartPos:  200,
+							EndPos:    202,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 17,
+								EndLine:   17,
+								StartPos:  200,
+								EndPos:    202,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 17,
+									EndLine:   17,
+									StartPos:  200,
+									EndPos:    202,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 16,
+											EndLine:   17,
+											StartPos:  197,
+											EndPos:    200,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					EqualTkn: &token.Token{
+						ID:    token.T_SR_EQUAL,
+						Value: []byte(">>="),
+						Position: &position.Position{
+							StartLine: 17,
+							EndLine:   17,
+							StartPos:  203,
+							EndPos:    206,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 17,
+									EndLine:   17,
+									StartPos:  202,
+									EndPos:    203,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 17,
+							EndLine:   17,
+							StartPos:  207,
+							EndPos:    209,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 17,
+								EndLine:   17,
+								StartPos:  207,
+								EndPos:    209,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 17,
+									EndLine:   17,
+									StartPos:  207,
+									EndPos:    209,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 17,
+											EndLine:   17,
+											StartPos:  206,
+											EndPos:    207,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprAssign_Coalesce(t *testing.T) {
-	src := `<? $a ??= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 17,
+						EndLine:   17,
+						StartPos:  209,
+						EndPos:    210,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 18,
+					EndLine:   18,
+					StartPos:  213,
+					EndPos:    223,
+				},
 				Expr: &ast.ExprAssignCoalesce{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 18,
+						EndLine:   18,
+						StartPos:  213,
+						EndPos:    222,
 					},
 					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 18,
+							EndLine:   18,
+							StartPos:  213,
+							EndPos:    215,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 18,
+								EndLine:   18,
+								StartPos:  213,
+								EndPos:    215,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 18,
+									EndLine:   18,
+									StartPos:  213,
+									EndPos:    215,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 17,
+											EndLine:   18,
+											StartPos:  210,
+											EndPos:    213,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					EqualTkn: &token.Token{
+						ID:    token.T_COALESCE_EQUAL,
+						Value: []byte("??="),
+						Position: &position.Position{
+							StartLine: 18,
+							EndLine:   18,
+							StartPos:  216,
+							EndPos:    219,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 18,
+									EndLine:   18,
+									StartPos:  215,
+									EndPos:    216,
+								},
 							},
 						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 18,
+							EndLine:   18,
+							StartPos:  220,
+							EndPos:    222,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 18,
+								EndLine:   18,
+								StartPos:  220,
+								EndPos:    222,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 18,
+									EndLine:   18,
+									StartPos:  220,
+									EndPos:    222,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 18,
+											EndLine:   18,
+											StartPos:  219,
+											EndPos:    220,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 18,
+						EndLine:   18,
+						StartPos:  222,
+						EndPos:    223,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 // expr binary
 
 func TestExprBinary_BitwiseAnd(t *testing.T) {
-	src := `<? $a & $b;`
+	src := `<?
+		$a & $b;
+		$a | $b;
+		$a ^ $b;
+		$a && $b;
+		$a || $b;
+		$a ?? $b;
+		$a . $b;
+		$a / $b;
+		$a == $b;
+		$a >= $b;
+		$a > $b;
+		$a === $b;
+		$a and $b;
+		$a or $b;
+		$a xor $b;
+		$a - $b;
+		$a % $b;
+		$a * $b;
+		$a != $b;
+		$a !== $b;
+		$a + $b;
+		$a ** $b;
+		$a << $b;
+		$a >> $b;
+		$a <= $b;
+		$a < $b;
+		$a <=> $b;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   28,
+			StartPos:  5,
+			EndPos:    320,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
-					},
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    13,
 				},
 				Expr: &ast.ExprBinaryBitwiseAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  5,
+						EndPos:    12,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  5,
+							EndPos:    7,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  5,
+								EndPos:    7,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  5,
+									EndPos:    7,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_OPEN_TAG,
+										Value: []byte("<?"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  0,
+											EndPos:    2,
+										},
+									},
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   2,
+											StartPos:  2,
+											EndPos:    5,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(38),
+						Value: []byte("&"),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  8,
+							EndPos:    9,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  7,
+									EndPos:    8,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  10,
+							EndPos:    12,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  10,
+								EndPos:    12,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  10,
+									EndPos:    12,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  9,
+											EndPos:    10,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_BitwiseOr(t *testing.T) {
-	src := `<? $a | $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  12,
+						EndPos:    13,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 3,
+					EndLine:   3,
+					StartPos:  16,
+					EndPos:    24,
+				},
 				Expr: &ast.ExprBinaryBitwiseOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  16,
+						EndPos:    23,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  16,
+							EndPos:    18,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  16,
+								EndPos:    18,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  16,
+									EndPos:    18,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   3,
+											StartPos:  13,
+											EndPos:    16,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(124),
+						Value: []byte("|"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  19,
+							EndPos:    20,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  18,
+									EndPos:    19,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  21,
+							EndPos:    23,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  21,
+								EndPos:    23,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  21,
+									EndPos:    23,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  20,
+											EndPos:    21,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_BitwiseXor(t *testing.T) {
-	src := `<? $a ^ $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  23,
+						EndPos:    24,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 4,
+					EndLine:   4,
+					StartPos:  27,
+					EndPos:    35,
+				},
 				Expr: &ast.ExprBinaryBitwiseXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  27,
+						EndPos:    34,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  27,
+							EndPos:    29,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  27,
+								EndPos:    29,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  27,
+									EndPos:    29,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   4,
+											StartPos:  24,
+											EndPos:    27,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(94),
+						Value: []byte("^"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  30,
+							EndPos:    31,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  29,
+									EndPos:    30,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  32,
+							EndPos:    34,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  32,
+								EndPos:    34,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  32,
+									EndPos:    34,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  31,
+											EndPos:    32,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_BooleanAnd(t *testing.T) {
-	src := `<? $a && $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  34,
+						EndPos:    35,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 5,
+					EndLine:   5,
+					StartPos:  38,
+					EndPos:    47,
+				},
 				Expr: &ast.ExprBinaryBooleanAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  38,
+						EndPos:    46,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  38,
+							EndPos:    40,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  38,
+								EndPos:    40,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  38,
+									EndPos:    40,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   5,
+											StartPos:  35,
+											EndPos:    38,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_BOOLEAN_AND,
+						Value: []byte("&&"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  41,
+							EndPos:    43,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  40,
+									EndPos:    41,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  44,
+							EndPos:    46,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  44,
+								EndPos:    46,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  44,
+									EndPos:    46,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  43,
+											EndPos:    44,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_BooleanOr(t *testing.T) {
-	src := `<? $a || $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  46,
+						EndPos:    47,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 6,
+					EndLine:   6,
+					StartPos:  50,
+					EndPos:    59,
+				},
 				Expr: &ast.ExprBinaryBooleanOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  50,
+						EndPos:    58,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  50,
+							EndPos:    52,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 6,
+								EndLine:   6,
+								StartPos:  50,
+								EndPos:    52,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  50,
+									EndPos:    52,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   6,
+											StartPos:  47,
+											EndPos:    50,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_BOOLEAN_OR,
+						Value: []byte("||"),
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  53,
+							EndPos:    55,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  52,
+									EndPos:    53,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  56,
+							EndPos:    58,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 6,
+								EndLine:   6,
+								StartPos:  56,
+								EndPos:    58,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  56,
+									EndPos:    58,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 6,
+											EndLine:   6,
+											StartPos:  55,
+											EndPos:    56,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Coalesce(t *testing.T) {
-	src := `<? $a ?? $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  58,
+						EndPos:    59,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 7,
+					EndLine:   7,
+					StartPos:  62,
+					EndPos:    71,
+				},
 				Expr: &ast.ExprBinaryCoalesce{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  62,
+						EndPos:    70,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  62,
+							EndPos:    64,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 7,
+								EndLine:   7,
+								StartPos:  62,
+								EndPos:    64,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  62,
+									EndPos:    64,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 6,
+											EndLine:   7,
+											StartPos:  59,
+											EndPos:    62,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_COALESCE,
+						Value: []byte("??"),
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  65,
+							EndPos:    67,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  64,
+									EndPos:    65,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  68,
+							EndPos:    70,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 7,
+								EndLine:   7,
+								StartPos:  68,
+								EndPos:    70,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  68,
+									EndPos:    70,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   7,
+											StartPos:  67,
+											EndPos:    68,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Concat(t *testing.T) {
-	src := `<? $a . $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  70,
+						EndPos:    71,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 8,
+					EndLine:   8,
+					StartPos:  74,
+					EndPos:    82,
+				},
 				Expr: &ast.ExprBinaryConcat{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 8,
+						EndLine:   8,
+						StartPos:  74,
+						EndPos:    81,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  74,
+							EndPos:    76,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 8,
+								EndLine:   8,
+								StartPos:  74,
+								EndPos:    76,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  74,
+									EndPos:    76,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   8,
+											StartPos:  71,
+											EndPos:    74,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(46),
+						Value: []byte("."),
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  77,
+							EndPos:    78,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  76,
+									EndPos:    77,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  79,
+							EndPos:    81,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 8,
+								EndLine:   8,
+								StartPos:  79,
+								EndPos:    81,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  79,
+									EndPos:    81,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 8,
+											EndLine:   8,
+											StartPos:  78,
+											EndPos:    79,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Div(t *testing.T) {
-	src := `<? $a / $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 8,
+						EndLine:   8,
+						StartPos:  81,
+						EndPos:    82,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 9,
+					EndLine:   9,
+					StartPos:  85,
+					EndPos:    93,
+				},
 				Expr: &ast.ExprBinaryDiv{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  85,
+						EndPos:    92,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  85,
+							EndPos:    87,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  85,
+								EndPos:    87,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  85,
+									EndPos:    87,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 8,
+											EndLine:   9,
+											StartPos:  82,
+											EndPos:    85,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(47),
+						Value: []byte("/"),
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  88,
+							EndPos:    89,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  87,
+									EndPos:    88,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  90,
+							EndPos:    92,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  90,
+								EndPos:    92,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  90,
+									EndPos:    92,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 9,
+											EndLine:   9,
+											StartPos:  89,
+											EndPos:    90,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Equal(t *testing.T) {
-	src := `<? $a == $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  92,
+						EndPos:    93,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 10,
+					EndLine:   10,
+					StartPos:  96,
+					EndPos:    105,
+				},
 				Expr: &ast.ExprBinaryEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 10,
+						EndLine:   10,
+						StartPos:  96,
+						EndPos:    104,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  96,
+							EndPos:    98,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 10,
+								EndLine:   10,
+								StartPos:  96,
+								EndPos:    98,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 10,
+									EndLine:   10,
+									StartPos:  96,
+									EndPos:    98,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 9,
+											EndLine:   10,
+											StartPos:  93,
+											EndPos:    96,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_IS_EQUAL,
+						Value: []byte("=="),
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  99,
+							EndPos:    101,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 10,
+									EndLine:   10,
+									StartPos:  98,
+									EndPos:    99,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  102,
+							EndPos:    104,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 10,
+								EndLine:   10,
+								StartPos:  102,
+								EndPos:    104,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 10,
+									EndLine:   10,
+									StartPos:  102,
+									EndPos:    104,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 10,
+											EndLine:   10,
+											StartPos:  101,
+											EndPos:    102,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_GreaterOrEqual(t *testing.T) {
-	src := `<? $a >= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 10,
+						EndLine:   10,
+						StartPos:  104,
+						EndPos:    105,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 11,
+					EndLine:   11,
+					StartPos:  108,
+					EndPos:    117,
+				},
 				Expr: &ast.ExprBinaryGreaterOrEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 11,
+						EndLine:   11,
+						StartPos:  108,
+						EndPos:    116,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  108,
+							EndPos:    110,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  108,
+								EndPos:    110,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  108,
+									EndPos:    110,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 10,
+											EndLine:   11,
+											StartPos:  105,
+											EndPos:    108,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_IS_GREATER_OR_EQUAL,
+						Value: []byte(">="),
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  111,
+							EndPos:    113,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  110,
+									EndPos:    111,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  114,
+							EndPos:    116,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  114,
+								EndPos:    116,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  114,
+									EndPos:    116,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 11,
+											EndLine:   11,
+											StartPos:  113,
+											EndPos:    114,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Greater(t *testing.T) {
-	src := `<? $a > $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 11,
+						EndLine:   11,
+						StartPos:  116,
+						EndPos:    117,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 12,
+					EndLine:   12,
+					StartPos:  120,
+					EndPos:    128,
+				},
 				Expr: &ast.ExprBinaryGreater{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 12,
+						EndLine:   12,
+						StartPos:  120,
+						EndPos:    127,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  120,
+							EndPos:    122,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 12,
+								EndLine:   12,
+								StartPos:  120,
+								EndPos:    122,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  120,
+									EndPos:    122,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 11,
+											EndLine:   12,
+											StartPos:  117,
+											EndPos:    120,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(62),
+						Value: []byte(">"),
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  123,
+							EndPos:    124,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  122,
+									EndPos:    123,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  125,
+							EndPos:    127,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 12,
+								EndLine:   12,
+								StartPos:  125,
+								EndPos:    127,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  125,
+									EndPos:    127,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 12,
+											EndLine:   12,
+											StartPos:  124,
+											EndPos:    125,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Identical(t *testing.T) {
-	src := `<? $a === $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 12,
+						EndLine:   12,
+						StartPos:  127,
+						EndPos:    128,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 13,
+					EndLine:   13,
+					StartPos:  131,
+					EndPos:    141,
+				},
 				Expr: &ast.ExprBinaryIdentical{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 13,
+						EndLine:   13,
+						StartPos:  131,
+						EndPos:    140,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 13,
+							EndLine:   13,
+							StartPos:  131,
+							EndPos:    133,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 13,
+								EndLine:   13,
+								StartPos:  131,
+								EndPos:    133,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 13,
+									EndLine:   13,
+									StartPos:  131,
+									EndPos:    133,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 12,
+											EndLine:   13,
+											StartPos:  128,
+											EndPos:    131,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					OpTkn: &token.Token{
+						ID:    token.T_IS_IDENTICAL,
+						Value: []byte("==="),
+						Position: &position.Position{
+							StartLine: 13,
+							EndLine:   13,
+							StartPos:  134,
+							EndPos:    137,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 13,
+									EndLine:   13,
+									StartPos:  133,
+									EndPos:    134,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 13,
+							EndLine:   13,
+							StartPos:  138,
+							EndPos:    140,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 13,
+								EndLine:   13,
+								StartPos:  138,
+								EndPos:    140,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 13,
+									EndLine:   13,
+									StartPos:  138,
+									EndPos:    140,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 13,
+											EndLine:   13,
+											StartPos:  137,
+											EndPos:    138,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_LogicalAnd(t *testing.T) {
-	src := `<? $a and $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 13,
+						EndLine:   13,
+						StartPos:  140,
+						EndPos:    141,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 14,
+					EndLine:   14,
+					StartPos:  144,
+					EndPos:    154,
+				},
 				Expr: &ast.ExprBinaryLogicalAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 14,
+						EndLine:   14,
+						StartPos:  144,
+						EndPos:    153,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 14,
+							EndLine:   14,
+							StartPos:  144,
+							EndPos:    146,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 14,
+								EndLine:   14,
+								StartPos:  144,
+								EndPos:    146,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 14,
+									EndLine:   14,
+									StartPos:  144,
+									EndPos:    146,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 13,
+											EndLine:   14,
+											StartPos:  141,
+											EndPos:    144,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					OpTkn: &token.Token{
+						ID:    token.T_LOGICAL_AND,
+						Value: []byte("and"),
+						Position: &position.Position{
+							StartLine: 14,
+							EndLine:   14,
+							StartPos:  147,
+							EndPos:    150,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 14,
+									EndLine:   14,
+									StartPos:  146,
+									EndPos:    147,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 14,
+							EndLine:   14,
+							StartPos:  151,
+							EndPos:    153,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 14,
+								EndLine:   14,
+								StartPos:  151,
+								EndPos:    153,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 14,
+									EndLine:   14,
+									StartPos:  151,
+									EndPos:    153,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 14,
+											EndLine:   14,
+											StartPos:  150,
+											EndPos:    151,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_LogicalOr(t *testing.T) {
-	src := `<? $a or $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 14,
+						EndLine:   14,
+						StartPos:  153,
+						EndPos:    154,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 15,
+					EndLine:   15,
+					StartPos:  157,
+					EndPos:    166,
+				},
 				Expr: &ast.ExprBinaryLogicalOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 15,
+						EndLine:   15,
+						StartPos:  157,
+						EndPos:    165,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 15,
+							EndLine:   15,
+							StartPos:  157,
+							EndPos:    159,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 15,
+								EndLine:   15,
+								StartPos:  157,
+								EndPos:    159,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 15,
+									EndLine:   15,
+									StartPos:  157,
+									EndPos:    159,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 14,
+											EndLine:   15,
+											StartPos:  154,
+											EndPos:    157,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_LOGICAL_OR,
+						Value: []byte("or"),
+						Position: &position.Position{
+							StartLine: 15,
+							EndLine:   15,
+							StartPos:  160,
+							EndPos:    162,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 15,
+									EndLine:   15,
+									StartPos:  159,
+									EndPos:    160,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 15,
+							EndLine:   15,
+							StartPos:  163,
+							EndPos:    165,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 15,
+								EndLine:   15,
+								StartPos:  163,
+								EndPos:    165,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 15,
+									EndLine:   15,
+									StartPos:  163,
+									EndPos:    165,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 15,
+											EndLine:   15,
+											StartPos:  162,
+											EndPos:    163,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_LogicalXor(t *testing.T) {
-	src := `<? $a xor $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 15,
+						EndLine:   15,
+						StartPos:  165,
+						EndPos:    166,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 16,
+					EndLine:   16,
+					StartPos:  169,
+					EndPos:    179,
+				},
 				Expr: &ast.ExprBinaryLogicalXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 16,
+						EndLine:   16,
+						StartPos:  169,
+						EndPos:    178,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 16,
+							EndLine:   16,
+							StartPos:  169,
+							EndPos:    171,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 16,
+								EndLine:   16,
+								StartPos:  169,
+								EndPos:    171,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 16,
+									EndLine:   16,
+									StartPos:  169,
+									EndPos:    171,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 15,
+											EndLine:   16,
+											StartPos:  166,
+											EndPos:    169,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					OpTkn: &token.Token{
+						ID:    token.T_LOGICAL_XOR,
+						Value: []byte("xor"),
+						Position: &position.Position{
+							StartLine: 16,
+							EndLine:   16,
+							StartPos:  172,
+							EndPos:    175,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 16,
+									EndLine:   16,
+									StartPos:  171,
+									EndPos:    172,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 16,
+							EndLine:   16,
+							StartPos:  176,
+							EndPos:    178,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 16,
+								EndLine:   16,
+								StartPos:  176,
+								EndPos:    178,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 16,
+									EndLine:   16,
+									StartPos:  176,
+									EndPos:    178,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 16,
+											EndLine:   16,
+											StartPos:  175,
+											EndPos:    176,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Minus(t *testing.T) {
-	src := `<? $a - $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 16,
+						EndLine:   16,
+						StartPos:  178,
+						EndPos:    179,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 17,
+					EndLine:   17,
+					StartPos:  182,
+					EndPos:    190,
+				},
 				Expr: &ast.ExprBinaryMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 17,
+						EndLine:   17,
+						StartPos:  182,
+						EndPos:    189,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 17,
+							EndLine:   17,
+							StartPos:  182,
+							EndPos:    184,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 17,
+								EndLine:   17,
+								StartPos:  182,
+								EndPos:    184,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 17,
+									EndLine:   17,
+									StartPos:  182,
+									EndPos:    184,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 16,
+											EndLine:   17,
+											StartPos:  179,
+											EndPos:    182,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(45),
+						Value: []byte("-"),
+						Position: &position.Position{
+							StartLine: 17,
+							EndLine:   17,
+							StartPos:  185,
+							EndPos:    186,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 17,
+									EndLine:   17,
+									StartPos:  184,
+									EndPos:    185,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 17,
+							EndLine:   17,
+							StartPos:  187,
+							EndPos:    189,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 17,
+								EndLine:   17,
+								StartPos:  187,
+								EndPos:    189,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 17,
+									EndLine:   17,
+									StartPos:  187,
+									EndPos:    189,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 17,
+											EndLine:   17,
+											StartPos:  186,
+											EndPos:    187,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Mod(t *testing.T) {
-	src := `<? $a % $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 17,
+						EndLine:   17,
+						StartPos:  189,
+						EndPos:    190,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 18,
+					EndLine:   18,
+					StartPos:  193,
+					EndPos:    201,
+				},
 				Expr: &ast.ExprBinaryMod{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 18,
+						EndLine:   18,
+						StartPos:  193,
+						EndPos:    200,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 18,
+							EndLine:   18,
+							StartPos:  193,
+							EndPos:    195,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 18,
+								EndLine:   18,
+								StartPos:  193,
+								EndPos:    195,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 18,
+									EndLine:   18,
+									StartPos:  193,
+									EndPos:    195,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 17,
+											EndLine:   18,
+											StartPos:  190,
+											EndPos:    193,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(37),
+						Value: []byte("%"),
+						Position: &position.Position{
+							StartLine: 18,
+							EndLine:   18,
+							StartPos:  196,
+							EndPos:    197,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 18,
+									EndLine:   18,
+									StartPos:  195,
+									EndPos:    196,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 18,
+							EndLine:   18,
+							StartPos:  198,
+							EndPos:    200,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 18,
+								EndLine:   18,
+								StartPos:  198,
+								EndPos:    200,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 18,
+									EndLine:   18,
+									StartPos:  198,
+									EndPos:    200,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 18,
+											EndLine:   18,
+											StartPos:  197,
+											EndPos:    198,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Mul(t *testing.T) {
-	src := `<? $a * $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 18,
+						EndLine:   18,
+						StartPos:  200,
+						EndPos:    201,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 19,
+					EndLine:   19,
+					StartPos:  204,
+					EndPos:    212,
+				},
 				Expr: &ast.ExprBinaryMul{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 19,
+						EndLine:   19,
+						StartPos:  204,
+						EndPos:    211,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 19,
+							EndLine:   19,
+							StartPos:  204,
+							EndPos:    206,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 19,
+								EndLine:   19,
+								StartPos:  204,
+								EndPos:    206,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 19,
+									EndLine:   19,
+									StartPos:  204,
+									EndPos:    206,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 18,
+											EndLine:   19,
+											StartPos:  201,
+											EndPos:    204,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(42),
+						Value: []byte("*"),
+						Position: &position.Position{
+							StartLine: 19,
+							EndLine:   19,
+							StartPos:  207,
+							EndPos:    208,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 19,
+									EndLine:   19,
+									StartPos:  206,
+									EndPos:    207,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 19,
+							EndLine:   19,
+							StartPos:  209,
+							EndPos:    211,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 19,
+								EndLine:   19,
+								StartPos:  209,
+								EndPos:    211,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 19,
+									EndLine:   19,
+									StartPos:  209,
+									EndPos:    211,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 19,
+											EndLine:   19,
+											StartPos:  208,
+											EndPos:    209,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_NotEqual(t *testing.T) {
-	src := `<? $a != $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 19,
+						EndLine:   19,
+						StartPos:  211,
+						EndPos:    212,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 20,
+					EndLine:   20,
+					StartPos:  215,
+					EndPos:    224,
+				},
 				Expr: &ast.ExprBinaryNotEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 20,
+						EndLine:   20,
+						StartPos:  215,
+						EndPos:    223,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 20,
+							EndLine:   20,
+							StartPos:  215,
+							EndPos:    217,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 20,
+								EndLine:   20,
+								StartPos:  215,
+								EndPos:    217,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 20,
+									EndLine:   20,
+									StartPos:  215,
+									EndPos:    217,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 19,
+											EndLine:   20,
+											StartPos:  212,
+											EndPos:    215,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_IS_NOT_EQUAL,
+						Value: []byte("!="),
+						Position: &position.Position{
+							StartLine: 20,
+							EndLine:   20,
+							StartPos:  218,
+							EndPos:    220,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 20,
+									EndLine:   20,
+									StartPos:  217,
+									EndPos:    218,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 20,
+							EndLine:   20,
+							StartPos:  221,
+							EndPos:    223,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 20,
+								EndLine:   20,
+								StartPos:  221,
+								EndPos:    223,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 20,
+									EndLine:   20,
+									StartPos:  221,
+									EndPos:    223,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 20,
+											EndLine:   20,
+											StartPos:  220,
+											EndPos:    221,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_NotIdentical(t *testing.T) {
-	src := `<? $a !== $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 20,
+						EndLine:   20,
+						StartPos:  223,
+						EndPos:    224,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 21,
+					EndLine:   21,
+					StartPos:  227,
+					EndPos:    237,
+				},
 				Expr: &ast.ExprBinaryNotIdentical{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 21,
+						EndLine:   21,
+						StartPos:  227,
+						EndPos:    236,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 21,
+							EndLine:   21,
+							StartPos:  227,
+							EndPos:    229,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 21,
+								EndLine:   21,
+								StartPos:  227,
+								EndPos:    229,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 21,
+									EndLine:   21,
+									StartPos:  227,
+									EndPos:    229,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 20,
+											EndLine:   21,
+											StartPos:  224,
+											EndPos:    227,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					OpTkn: &token.Token{
+						ID:    token.T_IS_NOT_IDENTICAL,
+						Value: []byte("!=="),
+						Position: &position.Position{
+							StartLine: 21,
+							EndLine:   21,
+							StartPos:  230,
+							EndPos:    233,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 21,
+									EndLine:   21,
+									StartPos:  229,
+									EndPos:    230,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 21,
+							EndLine:   21,
+							StartPos:  234,
+							EndPos:    236,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 21,
+								EndLine:   21,
+								StartPos:  234,
+								EndPos:    236,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 21,
+									EndLine:   21,
+									StartPos:  234,
+									EndPos:    236,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 21,
+											EndLine:   21,
+											StartPos:  233,
+											EndPos:    234,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Plus(t *testing.T) {
-	src := `<? $a + $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 21,
+						EndLine:   21,
+						StartPos:  236,
+						EndPos:    237,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 22,
+					EndLine:   22,
+					StartPos:  240,
+					EndPos:    248,
+				},
 				Expr: &ast.ExprBinaryPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 22,
+						EndLine:   22,
+						StartPos:  240,
+						EndPos:    247,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 22,
+							EndLine:   22,
+							StartPos:  240,
+							EndPos:    242,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 22,
+								EndLine:   22,
+								StartPos:  240,
+								EndPos:    242,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 22,
+									EndLine:   22,
+									StartPos:  240,
+									EndPos:    242,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 21,
+											EndLine:   22,
+											StartPos:  237,
+											EndPos:    240,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(43),
+						Value: []byte("+"),
+						Position: &position.Position{
+							StartLine: 22,
+							EndLine:   22,
+							StartPos:  243,
+							EndPos:    244,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 22,
+									EndLine:   22,
+									StartPos:  242,
+									EndPos:    243,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 22,
+							EndLine:   22,
+							StartPos:  245,
+							EndPos:    247,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 22,
+								EndLine:   22,
+								StartPos:  245,
+								EndPos:    247,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 22,
+									EndLine:   22,
+									StartPos:  245,
+									EndPos:    247,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 22,
+											EndLine:   22,
+											StartPos:  244,
+											EndPos:    245,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Pow(t *testing.T) {
-	src := `<? $a ** $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 22,
+						EndLine:   22,
+						StartPos:  247,
+						EndPos:    248,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 23,
+					EndLine:   23,
+					StartPos:  251,
+					EndPos:    260,
+				},
 				Expr: &ast.ExprBinaryPow{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 23,
+						EndLine:   23,
+						StartPos:  251,
+						EndPos:    259,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 23,
+							EndLine:   23,
+							StartPos:  251,
+							EndPos:    253,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 23,
+								EndLine:   23,
+								StartPos:  251,
+								EndPos:    253,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 23,
+									EndLine:   23,
+									StartPos:  251,
+									EndPos:    253,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 22,
+											EndLine:   23,
+											StartPos:  248,
+											EndPos:    251,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_POW,
+						Value: []byte("**"),
+						Position: &position.Position{
+							StartLine: 23,
+							EndLine:   23,
+							StartPos:  254,
+							EndPos:    256,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 23,
+									EndLine:   23,
+									StartPos:  253,
+									EndPos:    254,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 23,
+							EndLine:   23,
+							StartPos:  257,
+							EndPos:    259,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 23,
+								EndLine:   23,
+								StartPos:  257,
+								EndPos:    259,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 23,
+									EndLine:   23,
+									StartPos:  257,
+									EndPos:    259,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 23,
+											EndLine:   23,
+											StartPos:  256,
+											EndPos:    257,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_ShiftLeft(t *testing.T) {
-	src := `<? $a << $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 23,
+						EndLine:   23,
+						StartPos:  259,
+						EndPos:    260,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 24,
+					EndLine:   24,
+					StartPos:  263,
+					EndPos:    272,
+				},
 				Expr: &ast.ExprBinaryShiftLeft{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 24,
+						EndLine:   24,
+						StartPos:  263,
+						EndPos:    271,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 24,
+							EndLine:   24,
+							StartPos:  263,
+							EndPos:    265,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 24,
+								EndLine:   24,
+								StartPos:  263,
+								EndPos:    265,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 24,
+									EndLine:   24,
+									StartPos:  263,
+									EndPos:    265,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 23,
+											EndLine:   24,
+											StartPos:  260,
+											EndPos:    263,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_SL,
+						Value: []byte("<<"),
+						Position: &position.Position{
+							StartLine: 24,
+							EndLine:   24,
+							StartPos:  266,
+							EndPos:    268,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 24,
+									EndLine:   24,
+									StartPos:  265,
+									EndPos:    266,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 24,
+							EndLine:   24,
+							StartPos:  269,
+							EndPos:    271,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 24,
+								EndLine:   24,
+								StartPos:  269,
+								EndPos:    271,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 24,
+									EndLine:   24,
+									StartPos:  269,
+									EndPos:    271,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 24,
+											EndLine:   24,
+											StartPos:  268,
+											EndPos:    269,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_ShiftRight(t *testing.T) {
-	src := `<? $a >> $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 24,
+						EndLine:   24,
+						StartPos:  271,
+						EndPos:    272,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 25,
+					EndLine:   25,
+					StartPos:  275,
+					EndPos:    284,
+				},
 				Expr: &ast.ExprBinaryShiftRight{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 25,
+						EndLine:   25,
+						StartPos:  275,
+						EndPos:    283,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 25,
+							EndLine:   25,
+							StartPos:  275,
+							EndPos:    277,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 25,
+								EndLine:   25,
+								StartPos:  275,
+								EndPos:    277,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 25,
+									EndLine:   25,
+									StartPos:  275,
+									EndPos:    277,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 24,
+											EndLine:   25,
+											StartPos:  272,
+											EndPos:    275,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_SR,
+						Value: []byte(">>"),
+						Position: &position.Position{
+							StartLine: 25,
+							EndLine:   25,
+							StartPos:  278,
+							EndPos:    280,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 25,
+									EndLine:   25,
+									StartPos:  277,
+									EndPos:    278,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 25,
+							EndLine:   25,
+							StartPos:  281,
+							EndPos:    283,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 25,
+								EndLine:   25,
+								StartPos:  281,
+								EndPos:    283,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 25,
+									EndLine:   25,
+									StartPos:  281,
+									EndPos:    283,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 25,
+											EndLine:   25,
+											StartPos:  280,
+											EndPos:    281,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_SmallerOrEqual(t *testing.T) {
-	src := `<? $a <= $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    12,
+						StartLine: 25,
+						EndLine:   25,
+						StartPos:  283,
+						EndPos:    284,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 26,
+					EndLine:   26,
+					StartPos:  287,
+					EndPos:    296,
+				},
 				Expr: &ast.ExprBinarySmallerOrEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 26,
+						EndLine:   26,
+						StartPos:  287,
+						EndPos:    295,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 26,
+							EndLine:   26,
+							StartPos:  287,
+							EndPos:    289,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 26,
+								EndLine:   26,
+								StartPos:  287,
+								EndPos:    289,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 26,
+									EndLine:   26,
+									StartPos:  287,
+									EndPos:    289,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 25,
+											EndLine:   26,
+											StartPos:  284,
+											EndPos:    287,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
+					OpTkn: &token.Token{
+						ID:    token.T_IS_SMALLER_OR_EQUAL,
+						Value: []byte("<="),
+						Position: &position.Position{
+							StartLine: 26,
+							EndLine:   26,
+							StartPos:  290,
+							EndPos:    292,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 26,
+									EndLine:   26,
+									StartPos:  289,
+									EndPos:    290,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 26,
+							EndLine:   26,
+							StartPos:  293,
+							EndPos:    295,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 26,
+								EndLine:   26,
+								StartPos:  293,
+								EndPos:    295,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 26,
+									EndLine:   26,
+									StartPos:  293,
+									EndPos:    295,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 26,
+											EndLine:   26,
+											StartPos:  292,
+											EndPos:    293,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Smaller(t *testing.T) {
-	src := `<? $a < $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
+						StartLine: 26,
+						EndLine:   26,
+						StartPos:  295,
+						EndPos:    296,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 27,
+					EndLine:   27,
+					StartPos:  299,
+					EndPos:    307,
+				},
 				Expr: &ast.ExprBinarySmaller{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 27,
+						EndLine:   27,
+						StartPos:  299,
+						EndPos:    306,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 27,
+							EndLine:   27,
+							StartPos:  299,
+							EndPos:    301,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 27,
+								EndLine:   27,
+								StartPos:  299,
+								EndPos:    301,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 27,
+									EndLine:   27,
+									StartPos:  299,
+									EndPos:    301,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 26,
+											EndLine:   27,
+											StartPos:  296,
+											EndPos:    299,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(60),
+						Value: []byte("<"),
+						Position: &position.Position{
+							StartLine: 27,
+							EndLine:   27,
+							StartPos:  302,
+							EndPos:    303,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 27,
+									EndLine:   27,
+									StartPos:  301,
+									EndPos:    302,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 27,
+							EndLine:   27,
+							StartPos:  304,
+							EndPos:    306,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 27,
+								EndLine:   27,
+								StartPos:  304,
+								EndPos:    306,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 27,
+									EndLine:   27,
+									StartPos:  304,
+									EndPos:    306,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 27,
+											EndLine:   27,
+											StartPos:  303,
+											EndPos:    304,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprBinary_Spaceship(t *testing.T) {
-	src := `<? $a <=> $b;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
+						StartLine: 27,
+						EndLine:   27,
+						StartPos:  306,
+						EndPos:    307,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 28,
+					EndLine:   28,
+					StartPos:  310,
+					EndPos:    320,
+				},
 				Expr: &ast.ExprBinarySpaceship{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 28,
+						EndLine:   28,
+						StartPos:  310,
+						EndPos:    319,
 					},
 					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  3,
-								EndPos:    5,
-							},
+						Position: &position.Position{
+							StartLine: 28,
+							EndLine:   28,
+							StartPos:  310,
+							EndPos:    312,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 28,
+								EndLine:   28,
+								StartPos:  310,
+								EndPos:    312,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  3,
-									EndPos:    5,
+									StartLine: 28,
+									EndLine:   28,
+									StartPos:  310,
+									EndPos:    312,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 27,
+											EndLine:   28,
+											StartPos:  307,
+											EndPos:    310,
+										},
+									},
 								},
 							},
 							Value: []byte("$a"),
 						},
 					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
+					OpTkn: &token.Token{
+						ID:    token.T_SPACESHIP,
+						Value: []byte("<=>"),
+						Position: &position.Position{
+							StartLine: 28,
+							EndLine:   28,
+							StartPos:  313,
+							EndPos:    316,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 28,
+									EndLine:   28,
+									StartPos:  312,
+									EndPos:    313,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 28,
+							EndLine:   28,
+							StartPos:  317,
+							EndPos:    319,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 28,
+								EndLine:   28,
+								StartPos:  317,
+								EndPos:    319,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 28,
+									EndLine:   28,
+									StartPos:  317,
+									EndPos:    319,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 28,
+											EndLine:   28,
+											StartPos:  316,
+											EndPos:    317,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 28,
+						EndLine:   28,
+						StartPos:  319,
+						EndPos:    320,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 // expr cast
 
 func TestExprCast_Array(t *testing.T) {
-	src := `<? (array)$a;`
+	src := `<?
+		(array)$a;
+		(boolean)$a;
+		(bool)$a;
+		(double)$a;
+		(float)$a;
+		(integer)$a;
+		(int)$a;
+		(object)$a;
+		(string)$a;
+		(binary)$a;
+		(unset)$a;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   12,
+			StartPos:  5,
+			EndPos:    150,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
-					},
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    15,
 				},
 				Expr: &ast.ExprCastArray{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  5,
+						EndPos:    14,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_ARRAY_CAST,
+						Value: []byte("(array)"),
 						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  5,
 							EndPos:    12,
 						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   2,
+									StartPos:  2,
+									EndPos:    5,
 								},
 							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprCast_Bool(t *testing.T) {
-	src := `<? (boolean)$a;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    15,
-					},
-				},
-				Expr: &ast.ExprCastBool{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    14,
 						},
 					},
 					Expr: &ast.ExprVariable{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  12,
+							EndPos:    14,
+						},
+						VarName: &ast.Identifier{
 							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
+								StartLine: 2,
+								EndLine:   2,
 								StartPos:  12,
 								EndPos:    14,
 							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
+									StartLine: 2,
+									EndLine:   2,
 									StartPos:  12,
 									EndPos:    14,
 								},
@@ -26146,71 +54536,1066 @@ func TestExprCast_Bool(t *testing.T) {
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  14,
+						EndPos:    15,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 3,
+					EndLine:   3,
+					StartPos:  18,
+					EndPos:    30,
+				},
+				Expr: &ast.ExprCastBool{
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  18,
+						EndPos:    29,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_BOOL_CAST,
+						Value: []byte("(boolean)"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  18,
+							EndPos:    27,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   3,
+									StartPos:  15,
+									EndPos:    18,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  27,
+							EndPos:    29,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  27,
+								EndPos:    29,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  27,
+									EndPos:    29,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  29,
+						EndPos:    30,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 4,
+					EndLine:   4,
+					StartPos:  33,
+					EndPos:    42,
+				},
+				Expr: &ast.ExprCastBool{
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  33,
+						EndPos:    41,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_BOOL_CAST,
+						Value: []byte("(bool)"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  33,
+							EndPos:    39,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   4,
+									StartPos:  30,
+									EndPos:    33,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  39,
+							EndPos:    41,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  39,
+								EndPos:    41,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  39,
+									EndPos:    41,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  41,
+						EndPos:    42,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 5,
+					EndLine:   5,
+					StartPos:  45,
+					EndPos:    56,
+				},
+				Expr: &ast.ExprCastDouble{
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  45,
+						EndPos:    55,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_DOUBLE_CAST,
+						Value: []byte("(double)"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  45,
+							EndPos:    53,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   5,
+									StartPos:  42,
+									EndPos:    45,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  53,
+							EndPos:    55,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  53,
+								EndPos:    55,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  53,
+									EndPos:    55,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  55,
+						EndPos:    56,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 6,
+					EndLine:   6,
+					StartPos:  59,
+					EndPos:    69,
+				},
+				Expr: &ast.ExprCastDouble{
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  59,
+						EndPos:    68,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_DOUBLE_CAST,
+						Value: []byte("(float)"),
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  59,
+							EndPos:    66,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   6,
+									StartPos:  56,
+									EndPos:    59,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  66,
+							EndPos:    68,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 6,
+								EndLine:   6,
+								StartPos:  66,
+								EndPos:    68,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   6,
+									StartPos:  66,
+									EndPos:    68,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  68,
+						EndPos:    69,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 7,
+					EndLine:   7,
+					StartPos:  72,
+					EndPos:    84,
+				},
+				Expr: &ast.ExprCastInt{
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  72,
+						EndPos:    83,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_INT_CAST,
+						Value: []byte("(integer)"),
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  72,
+							EndPos:    81,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   7,
+									StartPos:  69,
+									EndPos:    72,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  81,
+							EndPos:    83,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 7,
+								EndLine:   7,
+								StartPos:  81,
+								EndPos:    83,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  81,
+									EndPos:    83,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  83,
+						EndPos:    84,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 8,
+					EndLine:   8,
+					StartPos:  87,
+					EndPos:    95,
+				},
+				Expr: &ast.ExprCastInt{
+					Position: &position.Position{
+						StartLine: 8,
+						EndLine:   8,
+						StartPos:  87,
+						EndPos:    94,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_INT_CAST,
+						Value: []byte("(int)"),
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  87,
+							EndPos:    92,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   8,
+									StartPos:  84,
+									EndPos:    87,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  92,
+							EndPos:    94,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 8,
+								EndLine:   8,
+								StartPos:  92,
+								EndPos:    94,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  92,
+									EndPos:    94,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 8,
+						EndLine:   8,
+						StartPos:  94,
+						EndPos:    95,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 9,
+					EndLine:   9,
+					StartPos:  98,
+					EndPos:    109,
+				},
+				Expr: &ast.ExprCastObject{
+					Position: &position.Position{
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  98,
+						EndPos:    108,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_OBJECT_CAST,
+						Value: []byte("(object)"),
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  98,
+							EndPos:    106,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 8,
+									EndLine:   9,
+									StartPos:  95,
+									EndPos:    98,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  106,
+							EndPos:    108,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  106,
+								EndPos:    108,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  106,
+									EndPos:    108,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  108,
+						EndPos:    109,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 10,
+					EndLine:   10,
+					StartPos:  112,
+					EndPos:    123,
+				},
+				Expr: &ast.ExprCastString{
+					Position: &position.Position{
+						StartLine: 10,
+						EndLine:   10,
+						StartPos:  112,
+						EndPos:    122,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_STRING_CAST,
+						Value: []byte("(string)"),
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  112,
+							EndPos:    120,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 9,
+									EndLine:   10,
+									StartPos:  109,
+									EndPos:    112,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  120,
+							EndPos:    122,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 10,
+								EndLine:   10,
+								StartPos:  120,
+								EndPos:    122,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 10,
+									EndLine:   10,
+									StartPos:  120,
+									EndPos:    122,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 10,
+						EndLine:   10,
+						StartPos:  122,
+						EndPos:    123,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 11,
+					EndLine:   11,
+					StartPos:  126,
+					EndPos:    137,
+				},
+				Expr: &ast.ExprCastString{
+					Position: &position.Position{
+						StartLine: 11,
+						EndLine:   11,
+						StartPos:  126,
+						EndPos:    136,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_STRING_CAST,
+						Value: []byte("(binary)"),
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  126,
+							EndPos:    134,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 10,
+									EndLine:   11,
+									StartPos:  123,
+									EndPos:    126,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  134,
+							EndPos:    136,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  134,
+								EndPos:    136,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  134,
+									EndPos:    136,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 11,
+						EndLine:   11,
+						StartPos:  136,
+						EndPos:    137,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 12,
+					EndLine:   12,
+					StartPos:  140,
+					EndPos:    150,
+				},
+				Expr: &ast.ExprCastUnset{
+					Position: &position.Position{
+						StartLine: 12,
+						EndLine:   12,
+						StartPos:  140,
+						EndPos:    149,
+					},
+					CastTkn: &token.Token{
+						ID:    token.T_UNSET_CAST,
+						Value: []byte("(unset)"),
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  140,
+							EndPos:    147,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 11,
+									EndLine:   12,
+									StartPos:  137,
+									EndPos:    140,
+								},
+							},
+						},
+					},
+					Expr: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  147,
+							EndPos:    149,
+						},
+						VarName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 12,
+								EndLine:   12,
+								StartPos:  147,
+								EndPos:    149,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$a"),
+								Position: &position.Position{
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  147,
+									EndPos:    149,
+								},
+							},
+							Value: []byte("$a"),
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 12,
+						EndLine:   12,
+						StartPos:  149,
+						EndPos:    150,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
-func TestExprCast_BoolShort(t *testing.T) {
-	src := `<? (bool)$a;`
+func TestStrings(t *testing.T) {
+	src := `<?
+		"test";
+		"\$test";
+		"
+			test
+		";
+		'$test';
+		'
+			$test
+		';
+	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    12,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   10,
+			StartPos:  5,
+			EndPos:    70,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    12,
+				},
+				Expr: &ast.ScalarString{
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  5,
+						EndPos:    11,
+					},
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("\"test\""),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  5,
+							EndPos:    11,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   2,
+									StartPos:  2,
+									EndPos:    5,
+								},
+							},
+						},
+					},
+					Value: []byte("\"test\""),
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  11,
 						EndPos:    12,
 					},
 				},
-				Expr: &ast.ExprCastBool{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 3,
+					EndLine:   3,
+					StartPos:  15,
+					EndPos:    24,
+				},
+				Expr: &ast.ScalarString{
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  15,
+						EndPos:    23,
 					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  9,
-								EndPos:    11,
-							},
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("\"\\$test\""),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  15,
+							EndPos:    23,
 						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  9,
-									EndPos:    11,
+									StartLine: 2,
+									EndLine:   3,
+									StartPos:  12,
+									EndPos:    15,
 								},
 							},
-							Value: []byte("$a"),
 						},
 					},
+					Value: []byte("\"\\$test\""),
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  23,
+						EndPos:    24,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 4,
+					EndLine:   6,
+					StartPos:  27,
+					EndPos:    41,
+				},
+				Expr: &ast.ScalarString{
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   6,
+						StartPos:  27,
+						EndPos:    40,
+					},
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("\"\n\t\t\ttest\n\t\t\""),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   6,
+							StartPos:  27,
+							EndPos:    40,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   4,
+									StartPos:  24,
+									EndPos:    27,
+								},
+							},
+						},
+					},
+					Value: []byte("\"\n\t\t\ttest\n\t\t\""),
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  40,
+						EndPos:    41,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 7,
+					EndLine:   7,
+					StartPos:  44,
+					EndPos:    52,
+				},
+				Expr: &ast.ScalarString{
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  44,
+						EndPos:    51,
+					},
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("'$test'"),
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  44,
+							EndPos:    51,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   7,
+									StartPos:  41,
+									EndPos:    44,
+								},
+							},
+						},
+					},
+					Value: []byte("'$test'"),
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  51,
+						EndPos:    52,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 8,
+					EndLine:   10,
+					StartPos:  55,
+					EndPos:    70,
+				},
+				Expr: &ast.ScalarString{
+					Position: &position.Position{
+						StartLine: 8,
+						EndLine:   10,
+						StartPos:  55,
+						EndPos:    69,
+					},
+					StringTkn: &token.Token{
+						ID:    token.T_CONSTANT_ENCAPSED_STRING,
+						Value: []byte("'\n\t\t\t$test\n\t\t'"),
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   10,
+							StartPos:  55,
+							EndPos:    69,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 7,
+									EndLine:   8,
+									StartPos:  52,
+									EndPos:    55,
+								},
+							},
+						},
+					},
+					Value: []byte("'\n\t\t\t$test\n\t\t'"),
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 10,
+						EndLine:   10,
+						StartPos:  69,
+						EndPos:    70,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 10,
+						EndLine:   11,
+						StartPos:  70,
+						EndPos:    72,
+					},
 				},
 			},
 		},
@@ -26220,525 +55605,477 @@ func TestExprCast_BoolShort(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
-func TestExprCast_Double(t *testing.T) {
-	src := `<? (double)$a;`
+func TestHeredoc(t *testing.T) {
+	src := `<?
+		<<<CAD
+CAD;
+		<<<CAD
+	hello
+CAD;
+		<<<"CAD"
+	hello
+CAD;
+		<<<"CAD"
+	hello $world
+CAD;
+		<<<'CAD'
+	hello $world
+CAD;
+	`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   15,
+			StartPos:  5,
+			EndPos:    120,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   3,
+					StartPos:  5,
+					EndPos:    16,
+				},
+				Expr: &ast.ScalarHeredoc{
 					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    14,
-					},
-				},
-				Expr: &ast.ExprCastDouble{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    13,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  11,
-								EndPos:    13,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  11,
-									EndPos:    13,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprCast_CastFloat(t *testing.T) {
-	src := `<? (float)$a;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
-					},
-				},
-				Expr: &ast.ExprCastDouble{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprCast_Int(t *testing.T) {
-	src := `<? (integer)$a;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    15,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
+						StartLine: 2,
+						EndLine:   3,
+						StartPos:  5,
 						EndPos:    15,
 					},
-				},
-				Expr: &ast.ExprCastInt{
-					Node: ast.Node{
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<CAD\n"),
 						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    14,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  12,
-								EndPos:    14,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  12,
-									EndPos:    14,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprCast_IntShort(t *testing.T) {
-	src := `<? (int)$a;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    11,
-					},
-				},
-				Expr: &ast.ExprCastInt{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  8,
-								EndPos:    10,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprCast_Object(t *testing.T) {
-	src := `<? (object)$a;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    14,
-					},
-				},
-				Expr: &ast.ExprCastObject{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    13,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  11,
-								EndPos:    13,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  11,
-									EndPos:    13,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprCast_String(t *testing.T) {
-	src := `<? (string)$a;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    14,
-					},
-				},
-				Expr: &ast.ExprCastString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    13,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  11,
-								EndPos:    13,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  11,
-									EndPos:    13,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprCast_BinaryString(t *testing.T) {
-	src := `<? (binary)$a;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    14,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    14,
-					},
-				},
-				Expr: &ast.ExprCastString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    13,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  11,
-								EndPos:    13,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  11,
-									EndPos:    13,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestExprCast_Unset(t *testing.T) {
-	src := `<? (unset)$a;`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    13,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 1,
-						EndLine:   1,
-						StartPos:  3,
-						EndPos:    13,
-					},
-				},
-				Expr: &ast.ExprCastUnset{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  5,
 							EndPos:    12,
 						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 1,
-								EndLine:   1,
-								StartPos:  10,
-								EndPos:    12,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_OPEN_TAG,
+								Value: []byte("<?"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartPos:  0,
+									EndPos:    2,
+								},
+							},
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   2,
+									StartPos:  2,
+									EndPos:    5,
 								},
 							},
-							Value: []byte("$a"),
 						},
 					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("AD"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  13,
+							EndPos:    15,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  15,
+						EndPos:    16,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 4,
+					EndLine:   6,
+					StartPos:  19,
+					EndPos:    37,
+				},
+				Expr: &ast.ScalarHeredoc{
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   6,
+						StartPos:  19,
+						EndPos:    36,
+					},
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<CAD\n"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  19,
+							EndPos:    26,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   4,
+									StartPos:  16,
+									EndPos:    19,
+								},
+							},
+						},
+					},
+					Parts: []ast.Vertex{
+						&ast.ScalarEncapsedStringPart{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  26,
+								EndPos:    33,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\thello\n"),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  26,
+									EndPos:    33,
+								},
+							},
+							Value: []byte("\thello\n"),
+						},
+					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("CAD"),
+						Position: &position.Position{
+							StartLine: 6,
+							EndLine:   6,
+							StartPos:  33,
+							EndPos:    36,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 6,
+						EndLine:   6,
+						StartPos:  36,
+						EndPos:    37,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 7,
+					EndLine:   9,
+					StartPos:  40,
+					EndPos:    60,
+				},
+				Expr: &ast.ScalarHeredoc{
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   9,
+						StartPos:  40,
+						EndPos:    59,
+					},
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<\"CAD\"\n"),
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  40,
+							EndPos:    49,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 6,
+									EndLine:   7,
+									StartPos:  37,
+									EndPos:    40,
+								},
+							},
+						},
+					},
+					Parts: []ast.Vertex{
+						&ast.ScalarEncapsedStringPart{
+							Position: &position.Position{
+								StartLine: 8,
+								EndLine:   8,
+								StartPos:  49,
+								EndPos:    56,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\thello\n"),
+								Position: &position.Position{
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  49,
+									EndPos:    56,
+								},
+							},
+							Value: []byte("\thello\n"),
+						},
+					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("CAD"),
+						Position: &position.Position{
+							StartLine: 9,
+							EndLine:   9,
+							StartPos:  56,
+							EndPos:    59,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  59,
+						EndPos:    60,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 10,
+					EndLine:   12,
+					StartPos:  63,
+					EndPos:    90,
+				},
+				Expr: &ast.ScalarHeredoc{
+					Position: &position.Position{
+						StartLine: 10,
+						EndLine:   12,
+						StartPos:  63,
+						EndPos:    89,
+					},
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<\"CAD\"\n"),
+						Position: &position.Position{
+							StartLine: 10,
+							EndLine:   10,
+							StartPos:  63,
+							EndPos:    72,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 9,
+									EndLine:   10,
+									StartPos:  60,
+									EndPos:    63,
+								},
+							},
+						},
+					},
+					Parts: []ast.Vertex{
+						&ast.ScalarEncapsedStringPart{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  72,
+								EndPos:    79,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\thello "),
+								Position: &position.Position{
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  72,
+									EndPos:    79,
+								},
+							},
+							Value: []byte("\thello "),
+						},
+						&ast.ExprVariable{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  79,
+								EndPos:    85,
+							},
+							VarName: &ast.Identifier{
+								Position: &position.Position{
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  79,
+									EndPos:    85,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$world"),
+									Position: &position.Position{
+										StartLine: 11,
+										EndLine:   11,
+										StartPos:  79,
+										EndPos:    85,
+									},
+								},
+								Value: []byte("$world"),
+							},
+						},
+						&ast.ScalarEncapsedStringPart{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  85,
+								EndPos:    86,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\n"),
+								Position: &position.Position{
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  85,
+									EndPos:    86,
+								},
+							},
+							Value: []byte("\n"),
+						},
+					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("CAD"),
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  86,
+							EndPos:    89,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 12,
+						EndLine:   12,
+						StartPos:  89,
+						EndPos:    90,
+					},
+				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 13,
+					EndLine:   15,
+					StartPos:  93,
+					EndPos:    120,
+				},
+				Expr: &ast.ScalarHeredoc{
+					Position: &position.Position{
+						StartLine: 13,
+						EndLine:   15,
+						StartPos:  93,
+						EndPos:    119,
+					},
+					OpenHeredocTkn: &token.Token{
+						ID:    token.T_START_HEREDOC,
+						Value: []byte("<<<'CAD'\n"),
+						Position: &position.Position{
+							StartLine: 13,
+							EndLine:   13,
+							StartPos:  93,
+							EndPos:    102,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 12,
+									EndLine:   13,
+									StartPos:  90,
+									EndPos:    93,
+								},
+							},
+						},
+					},
+					Parts: []ast.Vertex{
+						&ast.ScalarEncapsedStringPart{
+							Position: &position.Position{
+								StartLine: 14,
+								EndLine:   14,
+								StartPos:  102,
+								EndPos:    116,
+							},
+							EncapsedStrTkn: &token.Token{
+								ID:    token.T_ENCAPSED_AND_WHITESPACE,
+								Value: []byte("\thello $world\n"),
+								Position: &position.Position{
+									StartLine: 14,
+									EndLine:   14,
+									StartPos:  102,
+									EndPos:    116,
+								},
+							},
+							Value: []byte("\thello $world\n"),
+						},
+					},
+					CloseHeredocTkn: &token.Token{
+						ID:    token.T_END_HEREDOC,
+						Value: []byte("CAD"),
+						Position: &position.Position{
+							StartLine: 15,
+							EndLine:   15,
+							StartPos:  116,
+							EndPos:    119,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 15,
+						EndLine:   15,
+						StartPos:  119,
+						EndPos:    120,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{
+			FreeFloating: []*token.Token{
+				{
+					ID:    token.T_WHITESPACE,
+					Value: []byte("\n\t"),
+					Position: &position.Position{
+						StartLine: 15,
+						EndLine:   16,
+						StartPos:  120,
+						EndPos:    122,
+					},
 				},
 			},
 		},
@@ -26748,7 +56085,30 @@ func TestExprCast_Unset(t *testing.T) {
 	php7parser := php7.NewParser(lexer, nil)
 	php7parser.Parse()
 	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
+
+func TestControlCharsErrors(t *testing.T) {
+	src := "<?php \004 echo $b; \"$a[\005test]\";"
+
+	expected := []*errors.Error{
+		{
+			Msg: "WARNING: Unexpected character in input: '\004' (ASCII=4)",
+			Pos: &position.Position{StartLine: 1, EndLine: 1, StartPos: 6, EndPos: 7},
+		},
+		{
+			Msg: "WARNING: Unexpected character in input: '\005' (ASCII=5)",
+			Pos: &position.Position{StartLine: 1, EndLine: 1, StartPos: 21, EndPos: 22},
+		},
+	}
+
+	parserErrors := []*errors.Error{}
+	errorHandlerFunc := func(e *errors.Error) {
+		parserErrors = append(parserErrors, e)
+	}
+
+	lexer := scanner.NewLexer([]byte(src), "7.4", errorHandlerFunc)
+	php7parser := php7.NewParser(lexer, errorHandlerFunc)
+	php7parser.Parse()
+	assert.DeepEqual(t, expected, parserErrors)
+}
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 957aacc5500f2c339c838a4689b1e98a7964b902..82fd500097cc4aea6ed76dd483fc23d9c33a45f0 100644
GIT binary patch
delta 6510
zcmZWud3=sn_Wzu7-$W9T#4fVihT7ijf{+lqA&Q@6ilEx5HH_*)iP2Wk+NzEzK8>`-
zuhp@&b*FR)MO7I|(b5*7tziZe=2JnW=6mn+yl>LZfA3wMv)%9co^$W}){Z(ichuPt
z70Jm-i((>mOeBr(AWMc)sGdKVK2Z`kfO_kKq4cAY=7Xs>rOU#h)W9sVhtf3$Z9LL=
zBsGz;eH<nwBdD*$dnj23jHEuClB9<;<-R1}jl%q@>oi%GkEXuV$(@dS4AV)SIZDcM
zc(9aWNGa~xgt62|%BE0bDIQDfIm0WPB9&KO8)x>2eu8>RWFB3oR9To!3HmqVsgh)7
zILAqg@suqKa;d*QK9Od!nQSEaQz=IBpP*ix;??-N8*yr)tE&4`Fk|L@?1HM{a{DRj
z<2ovXCez!To-7A;QZu=+p6W=mDb$-gd1dkxdPYW1g{uvwQg1nBe!Vu8ddYxk_!Te>
z)*m*%7EGfY={g+|f(g-5fd$9rSUqMsEg-3z0sl)<$fGM~(4!<rX5y=YnUK_N7KO_B
zXs+#idUqy1P0?Ais6NZ4P86qS&87+pNDm1Po-6UsQ476#4z2efJlNA*;^$G29yOP4
zk`#q1SH}}CPzRz6DJ{YGAI>K)nb6K0<Fg^4fI1Q<Cdwy&G$H~yNRMAgqw$Hx%u9s8
z*p>W#TuV=Vk%p3dx!L#eg_p=fP;Z6vVv3-^)I@7t*%E4{yS+lf0V$5T%c!;HWi*Qe
z(tP$ela<RTP%zt8wy&Tl>AMV}u)o$WqZX29=FTjmR(4K*w48o4u5_OT&-bsS<*X9D
zUb!@d8cBR#3YO`wQz@{PwT2e6FXmU)!eu9Vsq5&An&FRolinjrlU1#$qug6h{U}xU
z+&~kRgAFV4@LRML4sN=N;LO-Sf%>^Z$|7l11f3CkC|oXV@?pvB*S(5pK2cH)qrQKe
zmLP~mf?oL!<&ew@RKVwE;Ir1B@v%MG>3^mhN<M!N@VALo@E-LwI85+B*aHk?*H&NB
zP2LJqQ=FwMTag|a)#~)1_vskRkS-J__}NhM(^PNSIG7{#*6q}grSC3SUS@#3{V}R5
z1HG!YJlqLo$rkht#hc2h^7<~!q<H04I)5!6en9=4ka(M_gL39W42=Sv`4J^@4LrZ5
zX&TFudz{z|SIIb?nLV*_@g52$soD$gY|wV^g+pIvah#6%ggzk2+~*7DPk%!m4N0ST
z{n$R*NwT;Y-`GUTD#kZ9cXA(NkF-6)nUb}f(<SNvZNzEUoy@Uv>{A*qxuq1Y`y8al
zNhb6GRLy>kmG{Ys%kxL5gA|U3kinf*Jt>&XwWRDY&9!WzvHDjszWZ}Tx_*vB_}>qb
z<;+poWJ7^1#pGg6qQ0Qd0c0a!_i;J|nlfBt@l;+yO(n0021!X8&{GnnJTmt0^i_2f
z#kXaQK6a97)dVb7{;$T^ztbbd+qk#HWkBM%QVNsYJ#cQ|BPv+(vM{VTN%iFVFl0z^
zcNHd&oT3x*_-O<->@<y#;+-b=ttnEkIZe+{jdAC%3_k^(g<l80Mlnc|gl6!o%UK^D
ztV>JJk@wfpDL;#FR`Ue5>^0Hxr>dUxEo~xBOEP)URu=z23#GV->q%Z86(kSqf&#n#
z2W)ofJTh9^m4O$xMygiw!$k{yd^F?N`!_7$FkMncN$x2_L$*X*gKvc$sJ>oynMw>*
z8GRc1HnKBlEm{A>a^63vJ5D`GWBnFO=ygP=_zF_=$iDzc3nP@Q2GaF94MR4A@N5ms
zl?T^N0-D0ok7W5xn~fl#j*=S!cQWsQ6B7PS2Nk@>bh2YLrh|0ie<;Qydn+91hsmr8
z<Xoy-_O4eT#@p{=4OT?UlXp=H(){rY(8umlsNrS{(%fG3H`#t4pQBD8WzR}!C4dRk
zB})GX5ENDg4*mE6Y8}8DCEFfQZAq!3H=SXg;vnfv9HJ|$s1c;<dJoCNE`r6k{F)SA
zrFgmUIZ~>;A19b!(YiZxU^T!4%<eCoJOIuWH<7U({z(!Ka=gTEB9E;wvLgT)xhR0U
z7#B?OkPCslL>7A4Mm<{Itc5Nj!;+?4{3C)D7Q~=kTkfX?^U}anQ$s@J(hQ2$ks*A|
zaBe|11T_xf49R_x+K2^2UN)+W#DsBQxfg~c1iPil&M-!=QeEUjrFA&;rCJGkWjLQQ
zWuY3Zi|X=Cf3R)kUR9sB5O+$dai)Ic>eUT7#6yXW0CX6`q?SQPx&g_mn)!=*^@=Qs
z=6<#YNRL>4T9zN-a2fq~Fx0wj6f4_*248#|!)OGm2}xt;Sd!N9aOhW5elZT3I+^yx
zGI^TJj<=ox*3G3Xp5Nv4L?^5m1j+6M-hk~Ua(Y%X<G0%>OlrYMydHO4-qOQcnX#q1
zUah&D01jL9hd;tC{Ji&<_Ml*I2xsexwj5)R%f)Z+_S{EGN<iz_^P?3MFEd`J#ggHL
z`{rCtHxxp$H4)?KNzmINg`=fa68Ba~UhsrhwbSd9ID(`}3RXc~VRAAV-ex%7V*BIL
zH1&T&Qkuf3ZeD*(=9>bHs$i1l<unLLH92!m-c9G;_-#|$E*|ZK(78CUmG4>xY_l0;
z*F(Bsh>G-$wC{=ovP~{XU|%M{#+My}7$UQ}!F5yP1;7f@W!?C;%TQ)47<+$-R~&**
z)C)QG@Uokzc-a@p{l(i0vaPTcJt;tM=*5SL(`}V)ZboP?1NuRqKi@R^wrt<2N@;&y
z?3OlkAOjGvkpmGhU^LP&TOElQ2uBhnaU+;x$w0&{$?H;E^dM-q<rh4dD<{p+rX#wH
zMzZoKhe&=b_t9uI{$iUib8Q&+C_klSbw{@dOYtxcmh$0z$9!rFbE=fD0M;$pPaVN2
zY#0!v)>3MZ;88k$G^1xRYBj2Of`yd*E<~>#!^5k`9vw1{$u@fKx;KxT8f31ThbzL$
zF&wD#$8!`(_8Gtm!b0@U2^?wC+DY_D9IneJV#bgtnu!*=<0MFsUHu(PL-h0~45*7n
zaZA19NwZ|bkw1m&>N~$TW9yV1cb#lR+oq(gsQEle3Mcb)88+3yf@@;&RE{HAIS<@u
z3>1t5bjWmAiBC-s^ne*0>*FF_kk6qc<KIB8Y@NyM>bKp^@mZ`~eX;uH9}o$o1w3!1
z8$Au9Ekwp34m;+di~rpmsP*wv`D*xG_zY&uSs!?ods!7N1#`7@((~3Y)4te^Gv{)=
zPwyPAtu<`-9fBEGy<o=nhL<}BA?~rjgbaX%$7cLu0px*jU|LIkXrb{m!+2^f3)BIN
zxQUIwJrb)i=S6cQiKuI{aU_dgGWH+@E%m{de`y-MVpJow<8;;%{*BKn(<|opRsma<
zEk(o}OWe5#Ik}KquDwTHCF)gP<04}Y&Y<K~Ze)W7rSUpwIqtqr4`)qETv0O!A$rbA
zZthcOoZPpHqs?Jhiyy8wXIveDo@-1*E=3s-n$0i2VF=VVi*67~)?x?f-X8<OOfB7X
zojFKkhZQ^KPsRp|g$-|VDjcs5m=;v>1G%~Zw6t|2jtqTsluX!&Ottsw_(>eBk8R|9
zU(ogFw|D?KZMy#qP80%iGN}lq*nS^V1aauqEoMFXr6Pko$9~gSZ+V*oz-MV_QXC|{
zWBLJW*saZG$tH<iYPbbUh)Y5-5ZvYeAqVUVB*f`4?;^seOnTybJQo*u+b$bxtKMf^
z916DioJrrteaxj#FWklxTs6GIB)(sbgzmxx2HjVJJi8MG)qmt$u;7cdZubF?GeI`k
z(_248S@E}CH$Fm5NYUxLQRYnIz}%L4&|i79doL`gt3vg$z5Fvv+I}=RxUY?H-asbr
zN2ue95jos)!sP4yh@6k;Ji2=^-!c~q_YvaxPo3)FzJ;_uRCBW|4^~ZdM38Dk^66pU
zMjJ(3eA*a-HTNC;hohWqA3WUCnR<e=SprXhX6zAQyqG0_3{YIZq<X6<eX*w?7Qu00
zvhEaYAAOorq`_&_fK=!8<<--e1!KA%-8+qMY%^?;HtH)3n|{sB%}YtBlzxSRfu0DZ
z`mXG6$DtB;7Bd-1PU)S07WHP_IUFUf4YpAXl7MqO(i9{VoFrLw4s97S9iGL>jc?h#
z$vyQAPxN1@5&STzI>%%D_ovqK@i*L5vT`U>BEIF?Qj$e!YllL^!$YVnx#!^l;29&i
z-*bSJ=crKm?j2OClJk7g*HrDe!GRK=qw2_o3w+HWVdn*q^0kXx;ezoppO8;4A*}Eo
zNdKNclN*;EGLP06)*;iqS|y*!mm?_0lbnKgmP=)PS*BdUMwE>xv3eH#zz1Z_KVX*A
zUR~znvhON}I1DTLh+MsfFK}wn&KL8qLvsFYj#_(&y6MmU$!jgqIr21C8=JH;ChOfd
zINj2Xl@y@E{>_;rhs$xU3(6t%(kWE-igM@Z9ni?QTd<&-AqL#$>nM9yd>N1NW|GRE
zaKqet2Xdai<M{0Y=f)kFUR2?O$mj~&QQ_?_QO;BVNtW8&y@T#TF&Zd$c=RsX8~b`>
zsjEub+_%s}Qo1{e?&E_=mA+wgC3K;UjMl(kj;Y<%Tkkx;){m=vTl1?R+ZLL*kIGdm
zlAnJ@duNNHGx5e!)yt%}At3CSYAT{7qj{`eseVL^lGFgzS1JNjGOjK7<-Fb)W^EIw
zjQN(QQJX`gQGNALR@G7_eT*o77LW5)0K=F_ZM@J`^A*M!&Pzt^P$kvmC+8cg`?9wV
zbXIS+bJ5|LyAW<(k&GR0VCWhTM_Q6JtE+I*C^0(kA-5sfRu3j6JKi;{kKZow84Z>4
zOhaY*USAg!tTCHSHq1_wT+tZv-8QK(Q?-%YduW$OMyfuhRl-R>XAC?mx0|YdPUDNy
zsgj}5u(Fz9j$?>-M%^ezjUu@b3+s#9s`|1nR@rN*>r8B%>Zj4ZqLJPaZ{zE`YY&!*
z37D{*QM{~(#p^~)D;2)Bks2xUTc}56c{4TJ*RMl#=C2<m@WxY1o^P&ZJH-;Q36_!s
zHCE@hP>aZYdv2?GIERtm4om~GMR(Ln)pko}4ZY@KJ6gK6R_i<|UOaSJ)~ab$ODS*9
zZS=S{YJf}8K8+2WS2_Dm1vNm!#~oCxRJH|)4(_0)AlT*tr%O7(Un%se=KjaJp`400
z3a^@2<88|iv&JNkCi~z5WeL@K<l;m0HQp5E;p)^DfFVZXh44F;()HZk$1(kNd4_84
zwlp})7XAgn!tbQ;b-a$?z8fJO($#qLtF9ELt0v}oDMHHH;B}$oGwvv5{{pRU=!{qV
zo|(XydxP~0lpS6078Bl0Jzx#>u)bLjAP5!HA+KMO^*ZU?)8Iib>Zv9(?u3cDyqEf|
zc~~)}ux1dJ^~c5x=bwwK{nZEd_1vwHdw#2)t(lEO2CE>KNaFN!xhmAx|HtahL)0Am
sT5d~im!S%+2xvS`PaLKq$@zQZ%5Y_#jh%lzo*iKZCL`L)jS(v8zXoqvH2?qr

delta 6588
zcmZ`;dw7mlwtv=olTQ-43L$d&64Dec`Erj&C5i-55|_Gk)U`TpnQ&^fK}B`yF0`6u
zh!!nMmC(!f7?;pitF%%@#h7WBI#gBZnFmd^&TsGc{Sxh*^G}}d-Iul3<+pxo?VW2?
zL9bN>RYgT|O4huXNEH)FqdUok{<K0$FH@MT8$|K4d^EL{nz7VJN;_B~DzS*hu;dj`
z9wp1NY2=pBK~yR`7EzeO`fy8{J;{+WY9&2jrDvt8-Tf)Thf>w?fz;lIQY0*dT1x0p
zdQ5&Af?p;66eFvLQl6UIo%@h<7*4$?UCv*n335*VPE&IaaW9f7f1qA6psf`pHGd#c
z@sDzElBy>tU)E=Hv>q&yaU-dx)Ofh1RF9;w;`0>skf%n`RXOO=`_jlq%EwYS$r(f4
z)W1j5ERuua>{b}O!}@20-WV<W##5dw8czW#=qbt|PRn$ZSULeptk0q-xjun}QswOZ
zR3f)0Qa)#NmTr@1I%j6c?nyL5AL&RNJsC<SO~&fKPlkS*CsUdXnt~JJr@$Y_reJK<
z6xf_sjIr=yiqL-dS8o;59FpYu<W|=`96&N~Dh}srC|NZHPWyZ+Hm;ruVfoV#439!E
z!dZ6a!=UP?=@$8>2Kf8Wl(1(gLDl`4*7%S|2du4lW|5!TJd>`GY-oek@6M)9L|Ial
zjk9<TdGJwjiDOh@8Kn?*mA^m<@+TMjsU34^I6>FtFF?+(e(bL@=Fu=hd@(YcWIzT)
zJoqB{V91tNIG;kvm6mCA>9mLv)sh7y?CUWD#fzz(DqKv{*f+%ttS_f_f`JF5q#SOp
zSPVJl*Efry!*)H^b_pe#F=dt0MdGXsW0ne9LCcsrOHr@|Jm_E-M)LycxsrMVMdd4L
zK4PqaP?f;GDnlrVY;V1=ijF#-E?!MriPJN6ER&>nB><SLUaF+AmJYjHny;fp0_?>}
zwIBP){z`JGPu5YckrW{#_fUv*+<-XwZ9p8W4+BE4Y|xG=+NnXRl}dSo7Q!f?+HHiW
zuiu~^WP@SwChBeLv~LrAZ%Lewoh%_zvlSrPvXxrtjER*;-$KYUWoi@e{GPXP=*qXe
z8I`e(@)6PGXoPp|Hu{tiv#H%-z^mJ+xr9!G0d=vQC|CP)q^jRRE%XA|+(x<<aG0#|
zSWTthE{F`?rB7%_9c5cO`^g22LHRE{93_Q4X}|cqi$x|Q%;$aYne?684La6^!_6z+
zqX*eW@i|3PoGgQ%221`PSW_0k!RqWD^3^zlx{eQh_d;yl-@Lgnc`v<VT;xpm*bi^S
z?uTk-f7O24<^aygx$<i4A5o3{p&ydJlpf}XrN)OdW#U0vt5M*V#lty3c@EL1Bp1G;
z2!)03X=oeWj~u2>;)y_r*Bzz4GUhPE8LGg<ZXBi4LtguYK65sx#Yd<bY|_9p6OYmn
zWH(*nXjOQOJ|G)EIbTp~*|CB8NocecE^mKMr;T&OJ265<)=(1%jTn5){%Pjb=O^eH
z;N76Jg@mSYuuM7$#N?lZp(UrOjk<c0ib+<qgFX13q@5D4SvU9$3^@B0Wyq2<nld$(
zYir?huZ;yVwHA_0{$k>9Bw-&y^{T(qM&v_QBV1)&9r?-WZ)mQ>Ev06%Bj56qe$BY4
zYWGj7C4ds(h>*D3;L)@?oZ65r3Ojeg*>{k`klRz{c&NQPdx2^Y+J=<U;uXZN<=+na
zO8FHES353I4hd>Syq$qq-dBzMmY&xDhPR!Qn_tDrI;^rT3Q(SXmBzq!5L}d$bmc-R
z_+I1GVfAy@z!2#IhDef<mK>!@exO4Z${R*fZ7Y}DgjQw$Loq%wE!GBUupGRFLn?0p
zg|K#<&fsKu?>5Hf-NqP5+*d{ZM1h2pp_xgTee!EPPBu<*2HbbxcLc;}9wTe+AU+01
zzuciw+FOY-?-yEa0}bG@K*PDeQXFEdM&BhLwqX`!W&|?<@-p!})CEH^9Y4j%qc)<D
z<5#qVt_QI3D_C-mv%h@Fe9%r`$USPGi(jq8^D4(m;YRKvO?-KcoF7UK<(V?@xi9Bv
zvvkFfj!k$WEHcjbSjdYjO*mhx>o8oP8sW!aNS!~j*Pj=;k~P%_$ckcWt;PrNcLc`)
zHSzMt0Hi4Lw7pbL;BXb0X?3QGTd*j!H+PrG!Ds{wO#%E4CHYr`aK5|~jGCWRNs%%m
z1Z&c?G`Hk-gR3ru@KK%Ch6+!F@iiwL(Xzh{KzliyU(=vnwi3I32k7%HI6xOoY;|BW
zq&1|cI<UDM#l7w1MV<M=rtRDqPS#0h@_tz?kJhyIJ6`P+hkZY|fuaT@<byZ}PHu3S
zk0izO7S720?TDZFw&6+}J#Njfe(FdYZJu4b?UB6+e8f2Wezh$TKW*R`I`&hQ?f5bQ
zFeY$Dz_tz??GP90qQAQO0M9VnolJVABm7&Kjqqze7fhqMYj5?FlFK00+*}mE8J&2d
z_m~O~Tw$0JP0K)nQ(=7znVkmgO;6!G>6QX?&H0L3sw*iRYIBvQvLRBR3YTEvIOz8~
zm&K(s%0U`}>~&d@_Pmopr!wGBlQO75`{ZUO7Ec`x{xP2|I~&xPAew=!htN8v%jnKr
zE01Txx<*N*T`=YCI0L(S#ey<cnfPi*Wl32*#jCO$UayTl7=kjIl*69?54SxeyF2p1
zEA?oPd!!agSx?SaJM;N<l8O18hn&*TRW<nttDSYD`k+pI)SI&#!W>t?^GykADOEj?
zZ|4e3zM*ICB#W<7kc{jLtJ?I1y9^E2;**mz9N13m2L+7Dh6!W)!&@db(I-SmSzl@@
z)v=tX&>FnWl&n?{;MtaTuUkR}gEDd+<C}707(XW<{9u_qoJ*wY7=@_Zp}YgVa%Z^_
zXt`DBaDLhpegtU<r%Ty$NbTxko-8v)KmpUomW<*Mb#Vj_CN0pdhK*!0os`)VpyrI?
z*5rh82)uA$G)HNl>jMM_xZWSjkvgC4;OZqg<MfD^U-igyPeO<e)Cf*c`^Iw&%13`^
zzq<RBKEVcnUfgv8#~Wqt6Z~wV7EgpY+jxDRJy<hIZ$i)<HAAMbn<Q=%nkush-@a;C
zvDP)MQCGG4PaLZiG0Kh#w|rG?3BzEcTCA#{iVs^AGa3C~`Wt?amz<~hE^<766G-ju
zEU5M5beN&99L5u7XzQP$L<3osa+ta~gIhVw3i{F`+0Salf4qe}tDC_QYHq3iHr{}Y
zAocM~ZLN)sQVx*nnK&zOwqB&;qt6af1D@00xQUr>ms&ALyVQ6ChXklE%P@}!c(rw@
z@aN$QxgKc6X$dYhXdV=k!eCftzF&Sp$IPRVZxjtsC;p;k;2Jm!F$<fo4>VeqF9c-|
zUZBM_YFW4d?q0o6(->;AiHVOK$g_MmpIrnGdgElqLM8TjzRxaf6PNHxoMF%!yOdjM
zAbC}AsUgeQr_nbqRaVY%_nfLeTFz}7-QrR~FF8EwmIKSdqeU<4??$)0v=VLt#cQ{y
z<F9ZBO~c;sxs+S<bgENpwDU32L`_(whfO_mT(j-3(8G(F?^biV=`78y*d<l1tecX#
z7WrkGk)3Oi+jG`}YeQe<XYCNEEw6C_St*?x!Q)cV>oqi;2E6(txO&P4Y|Y*Pq?EnM
zL2_mT|7t7WR@J|*v(yu<FEkrag4`SLL2>RT_O;!lMs3!&Rzn;Z^^v7-0>$at0c|%|
zZDHUyQ|;QyGugye^?jTDox)=@n7<v>V&HaE3*Ex2YumX;gWW|{S_N;~`pDzEG{b<F
z<>Q?^T?Pa?FxZR<ub<V-cX*_Bu?cwnyC^=kV{v8B7C-zxEN=QfLbvRFT_hbaz(lm3
z)qw5V-8|f~b&c4|WWitF$BbZk_yC;V>VU3LVYr;{IRHvdwtFI6c7i3b+Dm$cBRNp5
zs752gsfLqRIF{fEqrc4h5bI2`{lnja>H4N-3|r@CoswpUG239a!nLNoxzoDUp-(uK
z?Tw*9mP@rh%FpYT7_1j7-jQsUJI7IEl5HQ1snL7D{ZXpw1iMg+Z*sC+`VxLX^N&ZA
zlPE4@PokE1PI9XJ<0Q5^O}4SA*C}X|a0*0%CL8g1^R%v>x^{PxxUV4P`e{y(x)gvp
zI@vlVo<t6m;xj16S#skvp!L}q9%tVNbXTi;S6>-c%L65;7GXEXpRdKC4mF^T_)0EW
zK9YNmN7zMY_gNlmZr5>=L!ea5Y$n;&4*@Ot7KEMC(+ZRaHtKx(Cx2~sX7LjDHQ%&@
zA6;<`LbK}lmTrU1mnuB3k!WrYHILx-fbT=n<zMgv(%If%hQ@yb-Av<qLCP;;8c$C#
zMxL48^WPZq3e`dm%D*nbD{y#&kb@HREr#xudr&g3c)=5|)?ML1Q%3DA_>7V3Ik+Ok
z<y#?=`#ry*GYs6Ijjj9&=@@j4?T3wfcGR5W;d1f^KCC;rmQwgL-1FIW9K7Z_0^93`
zZ5l{KgMG&h+yv}LHGHZyKcYdmiA+!H?>9*L-1NpJ!WQ?zO^5@4Ql;xHBre`NTI%PJ
zVA*mDDEW)7Ip)}e+c3^tjGcj3Z=3$?U_GZu<WJao@iqtxhyr&%Q;)@Ib{d)8Kh}E}
zC(GoYp?2q=8x|kCgT>~mWhBQ){x29n3e*GD)%Yz-e}PhHIsz0>bRWs1cVUEGR~68c
zNUzjdJ#|?%B#n{DNX;saQ%Biaz;@39HDcsNUn|e<qV1z9Tvon(=4++Mv-($_%K{H*
z)~ds&-NC534>^Toy1!*!c%lT~(HfNTQuCmdt_lLIGKUE6nbA)c!vig`X$N`yh_fd2
zD6E(fY;`f5s4cu0f|GZJ;AF3b2{<_n=Q~9Q_Q2*}nqefxShyM5k&J7Ofm8)nMD72m
z1%&9Ezvu%52mD(STVesOa}V(u$!lfx^7dQcE0;pW>FV@b5fw33jI?PD2{uLPX1rSz
z>@^70%XNXeEw4vo380c9(J@v&dotCNG1f4rROl=gcN_e<6l)EZ{jqpPHK8wdTfG$S
zp}k4&#z717zG&)Rf7um}0jJl}0u%(`<<jZ38hHc5%>@tIZvCtiCr8>^Puq=!_tYoU
zfdp$FN~(TS{@p%s@eq0OK`U6*C0gi6OhaRz*3NQ~m5P#T`iI}_>nzt3xV_rm-YPKs
z9A`6_(ZsO3i9W=l9;BEz<i^XbpHz2(`=)oYVpL+1)y=t1H9pb}l<^+RrdS1v&2(7H
zym|d+{WvY_Q>|VN^}}!}0<BAoQKB@>@;492crXY@b7p4nOqi}PgI5<<b1PN7m}Rx_
z(t#7vSgF|$Z<bYZPnGkK)fUgY`jr|f+`e%}F!Q)9PqOZp*_qa8{caQ{KV+iD)g*z*
zzHU!}5;`82m!v-ASJBIAAsw!AQwhwlT2y3%;9hzdDQ7O$jlGU@uztx@Pjt2LhHv^U
zFVb$wv`1iX1K<9p7Oawm-2obpI?>&l$X0UaOqG*oJ?h+a{x9d9?Su8{s%?Swv2)P%
zB0w#mpM?vvIT(TWQS16!e!6==LIGy|ttRStp@rv7`%a>;r<8Q1F!=IOiw0UKHoCi2
ky9OZz0b29VkMzf^-juBDe|~&C#Lgn~x)~u|hFU5A3wmZ^S^xk5

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 4b5c149..2c14cff 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -541,7 +541,9 @@ use_type:
 group_use_declaration:
         namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations possible_comma '}'
             {
-                $4.(*ast.ParserSeparatedList).SeparatorTkns = append($4.(*ast.ParserSeparatedList).SeparatorTkns, $5)
+                if $5 != nil {
+                    $4.(*ast.ParserSeparatedList).SeparatorTkns = append($4.(*ast.ParserSeparatedList).SeparatorTkns, $5)
+                }
 
                 $$ = &ast.StmtGroupUse{
                     Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ast.ParserSeparatedList).Items, $6),
@@ -559,7 +561,9 @@ group_use_declaration:
             }
     |   T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations possible_comma '}'
             {
-                $5.(*ast.ParserSeparatedList).SeparatorTkns = append($5.(*ast.ParserSeparatedList).SeparatorTkns, $6)
+                if $6 != nil {
+                    $5.(*ast.ParserSeparatedList).SeparatorTkns = append($5.(*ast.ParserSeparatedList).SeparatorTkns, $6)
+                }
 
                 $$ = &ast.StmtGroupUse{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $7),
diff --git a/internal/php7/php7_bench_test.go b/internal/php7/php7_bench_test.go
index d5f2636..3ba6578 100644
--- a/internal/php7/php7_bench_test.go
+++ b/internal/php7/php7_bench_test.go
@@ -1,6 +1,7 @@
 package php7_test
 
 import (
+	"io/ioutil"
 	"testing"
 
 	"github.com/z7zmey/php-parser/internal/php7"
@@ -8,381 +9,14 @@ import (
 )
 
 func BenchmarkPhp7(b *testing.B) {
-	src := `<?
-		foo($a, ...$b);
-		$foo($a, ...$b);
-		$foo->bar($a, ...$b);
-		foo::bar($a, ...$b);
-		$foo::bar($a, ...$b);
-		new foo($a, ...$b);
-		/** anonymous class */
-		new class ($a, ...$b) {};
-		new class {};
-		new $foo;
-		new $foo[1];
-		new $foo{$bar};
-		new $foo->bar;
-		new $foo::$bar;
-		new static::$bar;
+	src, err := ioutil.ReadFile("test.php")
 
-		function foo(?bar $bar=null, baz &...$baz) {}
-		class foo {public function foo(?bar $bar=null, baz &...$baz) {}}
-		function(?bar $bar=null, baz &...$baz) {};
-		static function(?bar $bar=null, baz &...$baz) {};
-
-		"test";
-		"\$test";
-		"
-			test
-		";
-		'$test';
-		'
-			$test
-		';
-		<<<CAD
-CAD;
-		<<<CAD
-	hello
-CAD;
-		<<<"CAD"
-	hello
-CAD;
-		<<<"CAD"
-	hello $world
-CAD;
-		<<<'CAD'
-	hello $world
-CAD;
-
-		1234567890123456789;
-		12345678901234567890;
-		0.;
-		0b0111111111111111111111111111111111111111111111111111111111111111;
-		0b1111111111111111111111111111111111111111111111111111111111111111;
-		0x007111111111111111;
-		0x8111111111111111;
-		__CLASS__;
-		__DIR__;
-		__FILE__;
-		__FUNCTION__;
-		__LINE__;
-		__NAMESPACE__;
-		__METHOD__;
-		__TRAIT__;
-
-		"test $var";
-		"test $var[1]";
-		"test $var[-1]";
-		"test $var[1234567890123456789012345678901234567890]";
-		"test $var[-1234567890123456789012345678901234567890]";
-		"test $var[bar]";
-		"test $var[$bar]";
-		"$foo $bar";
-		"test $foo->bar()";
-		"test ${foo}";
-		"test ${foo[0]}";
-		"test ${$foo}";
-		"test {$foo->bar()}";
-
-		if ($a) :
-		endif;
-		if ($a) :
-		elseif ($b):
-		endif;
-		if ($a) :
-		else:
-		endif;
-		if ($a) :
-		elseif ($b):
-		elseif ($c):
-		else:
-		endif;
-
-		while (1) { break; }
-		while (1) { break 2; }
-		while (1) : break(3); endwhile;
-		class foo{ public const FOO = 1, BAR = 2; }
-		class foo{ const FOO = 1, BAR = 2; }
-		class foo{ function bar() {} }
-		class foo{ public static function &bar() {} }
-		class foo{ public static function &bar(): void {} }
-		abstract class foo{ }
-		final class foo extends bar { }
-		final class foo implements bar { }
-		final class foo implements bar, baz { }
-		new class() extends foo implements bar, baz { };
-
-		const FOO = 1, BAR = 2;
-		while (1) { continue; }
-		while (1) { continue 2; }
-		while (1) { continue(3); }
-		declare(ticks=1);
-		declare(ticks=1) {}
-		declare(ticks=1): enddeclare;
-		do {} while(1);
-		echo $a, 1;
-		echo($a);
-		for($i = 0; $i < 10; $i++, $i++) {}
-		for(; $i < 10; $i++, $i++) : endfor;
-		foreach ($a as $v) {}
-		foreach ($a as $v) : endforeach;
-		foreach ($a as $k => $v) {}
-		foreach ($a as $k => &$v) {}
-		foreach ($a as $k => list($v)) {}
-		foreach ($a as $k => [$v]) {}
-		function foo() {}
-		function foo() {return;}
-		function &foo() {return 1;}
-		function &foo(): void {}
-		global $a, $b;
-		a: 
-		goto a;
-		__halt_compiler();
-		if ($a) {}
-		if ($a) {} elseif ($b) {}
-		if ($a) {} else {}
-		if ($a) {} elseif ($b) {} elseif ($c) {} else {}
-		if ($a) {} elseif ($b) {} else if ($c) {} else {}
-		?> <div></div> <?
-		interface Foo {}
-		interface Foo extends Bar {}
-		interface Foo extends Bar, Baz {}
-		namespace Foo;
-		namespace Foo {}
-		namespace {}
-		class foo {var $a;}
-		class foo {public static $a, $b = 1;}
-		static $a, $b = 1;
-
-		switch (1) :
-			case 1:
-			default:
-			case 2:
-		endswitch;
-
-		switch (1) :;
-			case 1;
-			case 2;
-		endswitch;
-		
-		switch (1) {
-			case 1: break;
-			case 2: break;
-		}
-		
-		switch (1) {;
-			case 1; break;
-			case 2; break;
-		}
-
-		throw $e;
-
-		trait Foo {}
-		class Foo { use Bar; }
-		class Foo { use Bar, Baz {} }
-		class Foo { use Bar, Baz { one as include; } }
-		class Foo { use Bar, Baz { one as public; } }
-		class Foo { use Bar, Baz { one as public two; } }
-		class Foo { use Bar, Baz { Bar::one insteadof Baz, Quux; Baz::one as two; } }
-
-		try {}
-		try {} catch (Exception $e) {}
-		try {} catch (Exception|RuntimeException $e) {}
-		try {} catch (Exception $e) {} catch (RuntimeException $e) {}
-		try {} catch (Exception $e) {} finally {}
-
-		unset($a, $b,);
-
-		use Foo;
-		use \Foo;
-		use \Foo as Bar;
-		use Foo, Bar;
-		use Foo, Bar as Baz;
-		use function Foo, \Bar;
-		use function Foo as foo, \Bar as bar;
-		use const Foo, \Bar;
-		use const Foo as foo, \Bar as bar;
-
-		use \Foo\{Bar, Baz};
-		use Foo\{Bar, Baz as quux};
-		use function Foo\{Bar, Baz};
-		use const \Foo\{Bar, Baz};
-		use Foo\{const Bar, function Baz};
-
-		$a[1];
-		$a[1][2];
-		array();
-		array(1);
-		array(1=>1, &$b,);
-		~$a;
-		!$a;
-
-		Foo::Bar;
-		$foo::Bar;
-		clone($a);
-		clone $a;
-		function(){};
-		function($a, $b) use ($c, &$d) {};
-		function(): void {};
-		foo;
-		namespace\foo;
-		\foo;
-
-		empty($a);
-		@$a;
-		eval($a);
-		exit;
-		exit($a);
-		die;
-		die($a);
-		foo();
-		namespace\foo();
-		\foo();
-		$foo();
-
-		$a--;
-		$a++;
-		--$a;
-		++$a;
-
-		include $a;
-		include_once $a;
-		require $a;
-		require_once $a;
-
-		$a instanceof Foo;
-		$a instanceof namespace\Foo;
-		$a instanceof \Foo;
-
-		isset($a, $b);
-		list($a) = $b;
-		list($a[]) = $b;
-		list(list($a)) = $b;
-
-		$a->foo();
-		new Foo();
-		new namespace\Foo();
-		new \Foo();
-		new class ($a, ...$b) {};
-		print($a);
-		$a->foo;
-		` + "`cmd $a`;" + `
-		` + "`cmd`;" + `
-		` + "``;" + `
-		[];
-		[1];
-		[1=>1, &$b,];
-
-		[$a] = $b;
-		[$a[]] = $b;
-		[list($a)] = $b;
-		Foo::bar();
-		namespace\Foo::bar();
-		\Foo::bar();
-		Foo::$bar;
-		$foo::$bar;
-		namespace\Foo::$bar;
-		\Foo::$bar;
-		$a ? $b : $c;
-		$a ? : $c;
-		$a ? $b ? $c : $d : $e;
-		$a ? $b : $c ? $d : $e;
-		-$a;
-		+$a;
-		$$a;
-		yield;
-		yield $a;
-		yield $a => $b;
-		yield from $a;
-		
-		(array)$a;
-		(boolean)$a;
-		(bool)$a;
-		(double)$a;
-		(float)$a;
-		(integer)$a;
-		(int)$a;
-		(object)$a;
-		(string)$a;
-		(unset)$a;
-
-		$a & $b;
-		$a | $b;
-		$a ^ $b;
-		$a && $b;
-		$a || $b;
-		$a ?? $b;
-		$a . $b;
-		$a / $b;
-		$a == $b;
-		$a >= $b;
-		$a > $b;
-		$a === $b;
-		$a and $b;
-		$a or $b;
-		$a xor $b;
-		$a - $b;
-		$a % $b;
-		$a * $b;
-		$a != $b;
-		$a !== $b;
-		$a + $b;
-		$a ** $b;
-		$a << $b;
-		$a >> $b;
-		$a <= $b;
-		$a < $b;
-		$a <=> $b;
-
-		$a =& $b;
-		$a = $b;
-		$a &= $b;
-		$a |= $b;
-		$a ^= $b;
-		$a .= $b;
-		$a /= $b;
-		$a -= $b;
-		$a %= $b;
-		$a *= $b;
-		$a += $b;
-		$a **= $b;
-		$a <<= $b;
-		$a >>= $b;
-
-		class foo {public function class() {} }
-		\foo\bar();
-
-		function foo(&$a, ...$b) {
-			__halt_compiler();
-			function bar() {}
-			class Baz {}
-			trait Quux{}
-			interface Quuux {}
-		}
-		
-		function foo(&$a = 1, ...$b = 1, $c = 1) {}
-		function foo(array $a, callable $b) {}
-		abstract final class foo { abstract protected static function bar(); final private function baz() {} }
-
-		(new Foo)->bar;
-		(new Foo)();
-		[$foo][0]();
-		foo[1]();
-		"foo"();
-		[1]{$foo}();
-		${foo()};
-
-		Foo::$bar();
-		Foo::{$bar[0]}();
-		
-		$foo->$bar;
-		$foo->{$bar[0]};
-
-		[1=>&$a, 2=>list($b)];
-	`
+	if err != nil {
+		b.Fatal("can not read test.php: " + err.Error())
+	}
 
 	for n := 0; n < b.N; n++ {
-		lexer := scanner.NewLexer([]byte(src), "7.4", nil)
+		lexer := scanner.NewLexer(src, "7.4", nil)
 		php7parser := php7.NewParser(lexer, nil)
 		php7parser.Parse()
 	}
diff --git a/internal/php7/php7_test.go b/internal/php7/php7_test.go
deleted file mode 100644
index 452a0a3..0000000
--- a/internal/php7/php7_test.go
+++ /dev/null
@@ -1,19703 +0,0 @@
-package php7_test
-
-import (
-	"io/ioutil"
-	"testing"
-
-	"gotest.tools/assert"
-
-	"github.com/z7zmey/php-parser/internal/php7"
-	"github.com/z7zmey/php-parser/internal/scanner"
-	"github.com/z7zmey/php-parser/pkg/ast"
-	"github.com/z7zmey/php-parser/pkg/ast/traverser"
-	"github.com/z7zmey/php-parser/pkg/ast/visitor"
-	"github.com/z7zmey/php-parser/pkg/errors"
-	"github.com/z7zmey/php-parser/pkg/position"
-)
-
-func TestPhp7(t *testing.T) {
-	src, err := ioutil.ReadFile("test.php")
-	assert.NilError(t, err)
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   348,
-				StartPos:  3,
-				EndPos:    5706,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 2,
-						EndLine:   2,
-						StartPos:  3,
-						EndPos:    18,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 2,
-							EndLine:   2,
-							StartPos:  3,
-							EndPos:    17,
-						},
-					},
-					Function: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 2,
-								EndLine:   2,
-								StartPos:  3,
-								EndPos:    6,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  3,
-										EndPos:    6,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 2,
-								EndLine:   2,
-								StartPos:  6,
-								EndPos:    17,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  7,
-										EndPos:    9,
-									},
-								},
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 2,
-											EndLine:   2,
-											StartPos:  7,
-											EndPos:    9,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 2,
-												EndLine:   2,
-												StartPos:  7,
-												EndPos:    9,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  11,
-										EndPos:    16,
-									},
-								},
-								Variadic: true,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 2,
-											EndLine:   2,
-											StartPos:  14,
-											EndPos:    16,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 2,
-												EndLine:   2,
-												StartPos:  14,
-												EndPos:    16,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 3,
-						EndLine:   3,
-						StartPos:  19,
-						EndPos:    35,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 3,
-							EndLine:   3,
-							StartPos:  19,
-							EndPos:    34,
-						},
-					},
-					Function: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 3,
-								EndLine:   3,
-								StartPos:  19,
-								EndPos:    23,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 3,
-									EndLine:   3,
-									StartPos:  19,
-									EndPos:    23,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 3,
-								EndLine:   3,
-								StartPos:  23,
-								EndPos:    34,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 3,
-										EndLine:   3,
-										StartPos:  24,
-										EndPos:    26,
-									},
-								},
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  24,
-											EndPos:    26,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 3,
-												EndLine:   3,
-												StartPos:  24,
-												EndPos:    26,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 3,
-										EndLine:   3,
-										StartPos:  28,
-										EndPos:    33,
-									},
-								},
-								Variadic: true,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  31,
-											EndPos:    33,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 3,
-												EndLine:   3,
-												StartPos:  31,
-												EndPos:    33,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 4,
-						EndLine:   4,
-						StartPos:  36,
-						EndPos:    57,
-					},
-				},
-				Expr: &ast.ExprMethodCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 4,
-							EndLine:   4,
-							StartPos:  36,
-							EndPos:    56,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 4,
-								EndLine:   4,
-								StartPos:  36,
-								EndPos:    40,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 4,
-									EndLine:   4,
-									StartPos:  36,
-									EndPos:    40,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					Method: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 4,
-								EndLine:   4,
-								StartPos:  42,
-								EndPos:    45,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 4,
-								EndLine:   4,
-								StartPos:  45,
-								EndPos:    56,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  46,
-										EndPos:    48,
-									},
-								},
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  46,
-											EndPos:    48,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 4,
-												EndLine:   4,
-												StartPos:  46,
-												EndPos:    48,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  50,
-										EndPos:    55,
-									},
-								},
-								Variadic: true,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  53,
-											EndPos:    55,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 4,
-												EndLine:   4,
-												StartPos:  53,
-												EndPos:    55,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 5,
-						EndLine:   5,
-						StartPos:  58,
-						EndPos:    78,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 5,
-							EndLine:   5,
-							StartPos:  58,
-							EndPos:    77,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 5,
-								EndLine:   5,
-								StartPos:  58,
-								EndPos:    61,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  58,
-										EndPos:    61,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					Call: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 5,
-								EndLine:   5,
-								StartPos:  63,
-								EndPos:    66,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 5,
-								EndLine:   5,
-								StartPos:  66,
-								EndPos:    77,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  67,
-										EndPos:    69,
-									},
-								},
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 5,
-											EndLine:   5,
-											StartPos:  67,
-											EndPos:    69,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 5,
-												EndLine:   5,
-												StartPos:  67,
-												EndPos:    69,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  71,
-										EndPos:    76,
-									},
-								},
-								Variadic: true,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 5,
-											EndLine:   5,
-											StartPos:  74,
-											EndPos:    76,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 5,
-												EndLine:   5,
-												StartPos:  74,
-												EndPos:    76,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 6,
-						EndLine:   6,
-						StartPos:  79,
-						EndPos:    100,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 6,
-							EndLine:   6,
-							StartPos:  79,
-							EndPos:    99,
-						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 6,
-								EndLine:   6,
-								StartPos:  79,
-								EndPos:    83,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 6,
-									EndLine:   6,
-									StartPos:  79,
-									EndPos:    83,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					Call: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 6,
-								EndLine:   6,
-								StartPos:  85,
-								EndPos:    88,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 6,
-								EndLine:   6,
-								StartPos:  88,
-								EndPos:    99,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 6,
-										EndLine:   6,
-										StartPos:  89,
-										EndPos:    91,
-									},
-								},
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 6,
-											EndLine:   6,
-											StartPos:  89,
-											EndPos:    91,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 6,
-												EndLine:   6,
-												StartPos:  89,
-												EndPos:    91,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 6,
-										EndLine:   6,
-										StartPos:  93,
-										EndPos:    98,
-									},
-								},
-								Variadic: true,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 6,
-											EndLine:   6,
-											StartPos:  96,
-											EndPos:    98,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 6,
-												EndLine:   6,
-												StartPos:  96,
-												EndPos:    98,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 7,
-						EndLine:   7,
-						StartPos:  101,
-						EndPos:    120,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 7,
-							EndLine:   7,
-							StartPos:  101,
-							EndPos:    119,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 7,
-								EndLine:   7,
-								StartPos:  105,
-								EndPos:    108,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 7,
-										EndLine:   7,
-										StartPos:  105,
-										EndPos:    108,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 7,
-								EndLine:   7,
-								StartPos:  108,
-								EndPos:    119,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 7,
-										EndLine:   7,
-										StartPos:  109,
-										EndPos:    111,
-									},
-								},
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 7,
-											EndLine:   7,
-											StartPos:  109,
-											EndPos:    111,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 7,
-												EndLine:   7,
-												StartPos:  109,
-												EndPos:    111,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 7,
-										EndLine:   7,
-										StartPos:  113,
-										EndPos:    118,
-									},
-								},
-								Variadic: true,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 7,
-											EndLine:   7,
-											StartPos:  116,
-											EndPos:    118,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 7,
-												EndLine:   7,
-												StartPos:  116,
-												EndPos:    118,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 9,
-						EndLine:   9,
-						StartPos:  144,
-						EndPos:    169,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 9,
-							EndLine:   9,
-							StartPos:  144,
-							EndPos:    168,
-						},
-					},
-					Class: &ast.StmtClass{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 9,
-								EndLine:   9,
-								StartPos:  148,
-								EndPos:    168,
-							},
-						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 9,
-									EndLine:   9,
-									StartPos:  154,
-									EndPos:    165,
-								},
-							},
-							Arguments: []ast.Vertex{
-								&ast.Argument{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 9,
-											EndLine:   9,
-											StartPos:  155,
-											EndPos:    157,
-										},
-									},
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 9,
-												EndLine:   9,
-												StartPos:  155,
-												EndPos:    157,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 9,
-													EndLine:   9,
-													StartPos:  155,
-													EndPos:    157,
-												},
-											},
-											Value: []byte("$a"),
-										},
-									},
-								},
-								&ast.Argument{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 9,
-											EndLine:   9,
-											StartPos:  159,
-											EndPos:    164,
-										},
-									},
-									Variadic: true,
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 9,
-												EndLine:   9,
-												StartPos:  162,
-												EndPos:    164,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 9,
-													EndLine:   9,
-													StartPos:  162,
-													EndPos:    164,
-												},
-											},
-											Value: []byte("$b"),
-										},
-									},
-								},
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 10,
-						EndLine:   10,
-						StartPos:  170,
-						EndPos:    183,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 10,
-							EndLine:   10,
-							StartPos:  170,
-							EndPos:    182,
-						},
-					},
-					Class: &ast.StmtClass{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 10,
-								EndLine:   10,
-								StartPos:  174,
-								EndPos:    182,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 11,
-						EndLine:   11,
-						StartPos:  184,
-						EndPos:    193,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 11,
-							EndLine:   11,
-							StartPos:  184,
-							EndPos:    192,
-						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 11,
-								EndLine:   11,
-								StartPos:  188,
-								EndPos:    192,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 11,
-									EndLine:   11,
-									StartPos:  188,
-									EndPos:    192,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 12,
-						EndLine:   12,
-						StartPos:  194,
-						EndPos:    206,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 12,
-							EndLine:   12,
-							StartPos:  194,
-							EndPos:    205,
-						},
-					},
-					Class: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 12,
-								EndLine:   12,
-								StartPos:  198,
-								EndPos:    205,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 12,
-									EndLine:   12,
-									StartPos:  198,
-									EndPos:    202,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 12,
-										EndLine:   12,
-										StartPos:  198,
-										EndPos:    202,
-									},
-								},
-								Value: []byte("$foo"),
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 12,
-									EndLine:   12,
-									StartPos:  203,
-									EndPos:    204,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 13,
-						EndLine:   13,
-						StartPos:  207,
-						EndPos:    222,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 13,
-							EndLine:   13,
-							StartPos:  207,
-							EndPos:    221,
-						},
-					},
-					Class: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 13,
-								EndLine:   13,
-								StartPos:  211,
-								EndPos:    221,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 13,
-									EndLine:   13,
-									StartPos:  211,
-									EndPos:    215,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 13,
-										EndLine:   13,
-										StartPos:  211,
-										EndPos:    215,
-									},
-								},
-								Value: []byte("$foo"),
-							},
-						},
-						Dim: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 13,
-									EndLine:   13,
-									StartPos:  216,
-									EndPos:    220,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 13,
-										EndLine:   13,
-										StartPos:  216,
-										EndPos:    220,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 14,
-						EndLine:   14,
-						StartPos:  223,
-						EndPos:    237,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 14,
-							EndLine:   14,
-							StartPos:  223,
-							EndPos:    236,
-						},
-					},
-					Class: &ast.ExprPropertyFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 14,
-								EndLine:   14,
-								StartPos:  227,
-								EndPos:    236,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 14,
-									EndLine:   14,
-									StartPos:  227,
-									EndPos:    231,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 14,
-										EndLine:   14,
-										StartPos:  227,
-										EndPos:    231,
-									},
-								},
-								Value: []byte("$foo"),
-							},
-						},
-						Property: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 14,
-									EndLine:   14,
-									StartPos:  233,
-									EndPos:    236,
-								},
-							},
-							Value: []byte("bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 15,
-						EndLine:   15,
-						StartPos:  238,
-						EndPos:    253,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 15,
-							EndLine:   15,
-							StartPos:  238,
-							EndPos:    252,
-						},
-					},
-					Class: &ast.ExprStaticPropertyFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 15,
-								EndLine:   15,
-								StartPos:  242,
-								EndPos:    252,
-							},
-						},
-						Class: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 15,
-									EndLine:   15,
-									StartPos:  242,
-									EndPos:    246,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 15,
-										EndLine:   15,
-										StartPos:  242,
-										EndPos:    246,
-									},
-								},
-								Value: []byte("$foo"),
-							},
-						},
-						Property: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 15,
-									EndLine:   15,
-									StartPos:  248,
-									EndPos:    252,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 15,
-										EndLine:   15,
-										StartPos:  248,
-										EndPos:    252,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 16,
-						EndLine:   16,
-						StartPos:  254,
-						EndPos:    271,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 16,
-							EndLine:   16,
-							StartPos:  254,
-							EndPos:    270,
-						},
-					},
-					Class: &ast.ExprStaticPropertyFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 16,
-								EndLine:   16,
-								StartPos:  258,
-								EndPos:    270,
-							},
-						},
-						Class: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 16,
-									EndLine:   16,
-									StartPos:  258,
-									EndPos:    264,
-								},
-							},
-							Value: []byte("static"),
-						},
-						Property: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 16,
-									EndLine:   16,
-									StartPos:  266,
-									EndPos:    270,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 16,
-										EndLine:   16,
-										StartPos:  266,
-										EndPos:    270,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 18,
-						EndLine:   18,
-						StartPos:  273,
-						EndPos:    318,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 18,
-							EndLine:   18,
-							StartPos:  282,
-							EndPos:    285,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Params: []ast.Vertex{
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 18,
-								EndLine:   18,
-								StartPos:  286,
-								EndPos:    300,
-							},
-						},
-						Type: &ast.Nullable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 18,
-									EndLine:   18,
-									StartPos:  286,
-									EndPos:    290,
-								},
-							},
-							Expr: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 18,
-										EndLine:   18,
-										StartPos:  287,
-										EndPos:    290,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 18,
-												EndLine:   18,
-												StartPos:  287,
-												EndPos:    290,
-											},
-										},
-										Value: []byte("bar"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 18,
-									EndLine:   18,
-									StartPos:  291,
-									EndPos:    295,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 18,
-										EndLine:   18,
-										StartPos:  291,
-										EndPos:    295,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-						DefaultValue: &ast.ExprConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 18,
-									EndLine:   18,
-									StartPos:  296,
-									EndPos:    300,
-								},
-							},
-							Const: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 18,
-										EndLine:   18,
-										StartPos:  296,
-										EndPos:    300,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 18,
-												EndLine:   18,
-												StartPos:  296,
-												EndPos:    300,
-											},
-										},
-										Value: []byte("null"),
-									},
-								},
-							},
-						},
-					},
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 18,
-								EndLine:   18,
-								StartPos:  302,
-								EndPos:    314,
-							},
-						},
-						Type: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 18,
-									EndLine:   18,
-									StartPos:  302,
-									EndPos:    305,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 18,
-											EndLine:   18,
-											StartPos:  302,
-											EndPos:    305,
-										},
-									},
-									Value: []byte("baz"),
-								},
-							},
-						},
-						Var: &ast.Reference{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 18,
-									EndLine:   18,
-									StartPos:  306,
-									EndPos:    314,
-								},
-							},
-							Var: &ast.Variadic{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 18,
-										EndLine:   18,
-										StartPos:  307,
-										EndPos:    314,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 18,
-											EndLine:   18,
-											StartPos:  310,
-											EndPos:    314,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 18,
-												EndLine:   18,
-												StartPos:  310,
-												EndPos:    314,
-											},
-										},
-										Value: []byte("$baz"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 19,
-						EndLine:   19,
-						StartPos:  319,
-						EndPos:    383,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 19,
-							EndLine:   19,
-							StartPos:  325,
-							EndPos:    328,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 19,
-								EndLine:   19,
-								StartPos:  330,
-								EndPos:    382,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 19,
-									EndLine:   19,
-									StartPos:  346,
-									EndPos:    349,
-								},
-							},
-							Value: []byte("foo"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 19,
-										EndLine:   19,
-										StartPos:  330,
-										EndPos:    336,
-									},
-								},
-								Value: []byte("public"),
-							},
-						},
-						Params: []ast.Vertex{
-							&ast.Parameter{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 19,
-										EndLine:   19,
-										StartPos:  350,
-										EndPos:    364,
-									},
-								},
-								Type: &ast.Nullable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 19,
-											EndLine:   19,
-											StartPos:  350,
-											EndPos:    354,
-										},
-									},
-									Expr: &ast.NameName{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 19,
-												EndLine:   19,
-												StartPos:  351,
-												EndPos:    354,
-											},
-										},
-										Parts: []ast.Vertex{
-											&ast.NameNamePart{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 19,
-														EndLine:   19,
-														StartPos:  351,
-														EndPos:    354,
-													},
-												},
-												Value: []byte("bar"),
-											},
-										},
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 19,
-											EndLine:   19,
-											StartPos:  355,
-											EndPos:    359,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 19,
-												EndLine:   19,
-												StartPos:  355,
-												EndPos:    359,
-											},
-										},
-										Value: []byte("$bar"),
-									},
-								},
-								DefaultValue: &ast.ExprConstFetch{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 19,
-											EndLine:   19,
-											StartPos:  360,
-											EndPos:    364,
-										},
-									},
-									Const: &ast.NameName{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 19,
-												EndLine:   19,
-												StartPos:  360,
-												EndPos:    364,
-											},
-										},
-										Parts: []ast.Vertex{
-											&ast.NameNamePart{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 19,
-														EndLine:   19,
-														StartPos:  360,
-														EndPos:    364,
-													},
-												},
-												Value: []byte("null"),
-											},
-										},
-									},
-								},
-							},
-							&ast.Parameter{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 19,
-										EndLine:   19,
-										StartPos:  366,
-										EndPos:    378,
-									},
-								},
-								Type: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 19,
-											EndLine:   19,
-											StartPos:  366,
-											EndPos:    369,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 19,
-													EndLine:   19,
-													StartPos:  366,
-													EndPos:    369,
-												},
-											},
-											Value: []byte("baz"),
-										},
-									},
-								},
-								Var: &ast.Reference{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 19,
-											EndLine:   19,
-											StartPos:  370,
-											EndPos:    378,
-										},
-									},
-									Var: &ast.Variadic{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 19,
-												EndLine:   19,
-												StartPos:  371,
-												EndPos:    378,
-											},
-										},
-										Var: &ast.ExprVariable{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 19,
-													EndLine:   19,
-													StartPos:  374,
-													EndPos:    378,
-												},
-											},
-											VarName: &ast.Identifier{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 19,
-														EndLine:   19,
-														StartPos:  374,
-														EndPos:    378,
-													},
-												},
-												Value: []byte("$baz"),
-											},
-										},
-									},
-								},
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 19,
-									EndLine:   19,
-									StartPos:  380,
-									EndPos:    382,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 20,
-						EndLine:   20,
-						StartPos:  384,
-						EndPos:    426,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 20,
-							EndLine:   20,
-							StartPos:  384,
-							EndPos:    425,
-						},
-					},
-					Params: []ast.Vertex{
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 20,
-									EndLine:   20,
-									StartPos:  393,
-									EndPos:    407,
-								},
-							},
-							Type: &ast.Nullable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 20,
-										EndLine:   20,
-										StartPos:  393,
-										EndPos:    397,
-									},
-								},
-								Expr: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 20,
-											EndLine:   20,
-											StartPos:  394,
-											EndPos:    397,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 20,
-													EndLine:   20,
-													StartPos:  394,
-													EndPos:    397,
-												},
-											},
-											Value: []byte("bar"),
-										},
-									},
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 20,
-										EndLine:   20,
-										StartPos:  398,
-										EndPos:    402,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 20,
-											EndLine:   20,
-											StartPos:  398,
-											EndPos:    402,
-										},
-									},
-									Value: []byte("$bar"),
-								},
-							},
-							DefaultValue: &ast.ExprConstFetch{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 20,
-										EndLine:   20,
-										StartPos:  403,
-										EndPos:    407,
-									},
-								},
-								Const: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 20,
-											EndLine:   20,
-											StartPos:  403,
-											EndPos:    407,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 20,
-													EndLine:   20,
-													StartPos:  403,
-													EndPos:    407,
-												},
-											},
-											Value: []byte("null"),
-										},
-									},
-								},
-							},
-						},
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 20,
-									EndLine:   20,
-									StartPos:  409,
-									EndPos:    421,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 20,
-										EndLine:   20,
-										StartPos:  409,
-										EndPos:    412,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 20,
-												EndLine:   20,
-												StartPos:  409,
-												EndPos:    412,
-											},
-										},
-										Value: []byte("baz"),
-									},
-								},
-							},
-							Var: &ast.Reference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 20,
-										EndLine:   20,
-										StartPos:  413,
-										EndPos:    421,
-									},
-								},
-								Var: &ast.Variadic{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 20,
-											EndLine:   20,
-											StartPos:  414,
-											EndPos:    421,
-										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 20,
-												EndLine:   20,
-												StartPos:  417,
-												EndPos:    421,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 20,
-													EndLine:   20,
-													StartPos:  417,
-													EndPos:    421,
-												},
-											},
-											Value: []byte("$baz"),
-										},
-									},
-								},
-							},
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 21,
-						EndLine:   21,
-						StartPos:  427,
-						EndPos:    476,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 21,
-							EndLine:   21,
-							StartPos:  427,
-							EndPos:    475,
-						},
-					},
-					Static: true,
-					Params: []ast.Vertex{
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 21,
-									EndLine:   21,
-									StartPos:  443,
-									EndPos:    457,
-								},
-							},
-							Type: &ast.Nullable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 21,
-										EndLine:   21,
-										StartPos:  443,
-										EndPos:    447,
-									},
-								},
-								Expr: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 21,
-											EndLine:   21,
-											StartPos:  444,
-											EndPos:    447,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 21,
-													EndLine:   21,
-													StartPos:  444,
-													EndPos:    447,
-												},
-											},
-											Value: []byte("bar"),
-										},
-									},
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 21,
-										EndLine:   21,
-										StartPos:  448,
-										EndPos:    452,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 21,
-											EndLine:   21,
-											StartPos:  448,
-											EndPos:    452,
-										},
-									},
-									Value: []byte("$bar"),
-								},
-							},
-							DefaultValue: &ast.ExprConstFetch{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 21,
-										EndLine:   21,
-										StartPos:  453,
-										EndPos:    457,
-									},
-								},
-								Const: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 21,
-											EndLine:   21,
-											StartPos:  453,
-											EndPos:    457,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 21,
-													EndLine:   21,
-													StartPos:  453,
-													EndPos:    457,
-												},
-											},
-											Value: []byte("null"),
-										},
-									},
-								},
-							},
-						},
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 21,
-									EndLine:   21,
-									StartPos:  459,
-									EndPos:    471,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 21,
-										EndLine:   21,
-										StartPos:  459,
-										EndPos:    462,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 21,
-												EndLine:   21,
-												StartPos:  459,
-												EndPos:    462,
-											},
-										},
-										Value: []byte("baz"),
-									},
-								},
-							},
-							Var: &ast.Reference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 21,
-										EndLine:   21,
-										StartPos:  463,
-										EndPos:    471,
-									},
-								},
-								Var: &ast.Variadic{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 21,
-											EndLine:   21,
-											StartPos:  464,
-											EndPos:    471,
-										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 21,
-												EndLine:   21,
-												StartPos:  467,
-												EndPos:    471,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 21,
-													EndLine:   21,
-													StartPos:  467,
-													EndPos:    471,
-												},
-											},
-											Value: []byte("$baz"),
-										},
-									},
-								},
-							},
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 23,
-						EndLine:   23,
-						StartPos:  478,
-						EndPos:    498,
-					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 23,
-							EndLine:   23,
-							StartPos:  478,
-							EndPos:    497,
-						},
-					},
-					Value: []byte("1234567890123456789"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 24,
-						EndLine:   24,
-						StartPos:  499,
-						EndPos:    520,
-					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 24,
-							EndLine:   24,
-							StartPos:  499,
-							EndPos:    519,
-						},
-					},
-					Value: []byte("12345678901234567890"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 25,
-						EndLine:   25,
-						StartPos:  521,
-						EndPos:    524,
-					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 25,
-							EndLine:   25,
-							StartPos:  521,
-							EndPos:    523,
-						},
-					},
-					Value: []byte("0."),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 26,
-						EndLine:   26,
-						StartPos:  525,
-						EndPos:    592,
-					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 26,
-							EndLine:   26,
-							StartPos:  525,
-							EndPos:    591,
-						},
-					},
-					Value: []byte("0b0111111111111111111111111111111111111111111111111111111111111111"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 27,
-						EndLine:   27,
-						StartPos:  593,
-						EndPos:    660,
-					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 27,
-							EndLine:   27,
-							StartPos:  593,
-							EndPos:    659,
-						},
-					},
-					Value: []byte("0b1111111111111111111111111111111111111111111111111111111111111111"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 28,
-						EndLine:   28,
-						StartPos:  661,
-						EndPos:    682,
-					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 28,
-							EndLine:   28,
-							StartPos:  661,
-							EndPos:    681,
-						},
-					},
-					Value: []byte("0x007111111111111111"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 29,
-						EndLine:   29,
-						StartPos:  683,
-						EndPos:    702,
-					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 29,
-							EndLine:   29,
-							StartPos:  683,
-							EndPos:    701,
-						},
-					},
-					Value: []byte("0x8111111111111111"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 30,
-						EndLine:   30,
-						StartPos:  703,
-						EndPos:    713,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 30,
-							EndLine:   30,
-							StartPos:  703,
-							EndPos:    712,
-						},
-					},
-					Value: []byte("__CLASS__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 31,
-						EndLine:   31,
-						StartPos:  714,
-						EndPos:    722,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 31,
-							EndLine:   31,
-							StartPos:  714,
-							EndPos:    721,
-						},
-					},
-					Value: []byte("__DIR__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 32,
-						EndLine:   32,
-						StartPos:  723,
-						EndPos:    732,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 32,
-							EndLine:   32,
-							StartPos:  723,
-							EndPos:    731,
-						},
-					},
-					Value: []byte("__FILE__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 33,
-						EndLine:   33,
-						StartPos:  733,
-						EndPos:    746,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 33,
-							EndLine:   33,
-							StartPos:  733,
-							EndPos:    745,
-						},
-					},
-					Value: []byte("__FUNCTION__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 34,
-						EndLine:   34,
-						StartPos:  747,
-						EndPos:    756,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 34,
-							EndLine:   34,
-							StartPos:  747,
-							EndPos:    755,
-						},
-					},
-					Value: []byte("__LINE__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 35,
-						EndLine:   35,
-						StartPos:  757,
-						EndPos:    771,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 35,
-							EndLine:   35,
-							StartPos:  757,
-							EndPos:    770,
-						},
-					},
-					Value: []byte("__NAMESPACE__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 36,
-						EndLine:   36,
-						StartPos:  772,
-						EndPos:    783,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 36,
-							EndLine:   36,
-							StartPos:  772,
-							EndPos:    782,
-						},
-					},
-					Value: []byte("__METHOD__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 37,
-						EndLine:   37,
-						StartPos:  784,
-						EndPos:    794,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 37,
-							EndLine:   37,
-							StartPos:  784,
-							EndPos:    793,
-						},
-					},
-					Value: []byte("__TRAIT__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 39,
-						EndLine:   39,
-						StartPos:  796,
-						EndPos:    808,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 39,
-							EndLine:   39,
-							StartPos:  796,
-							EndPos:    807,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 39,
-									EndLine:   39,
-									StartPos:  797,
-									EndPos:    802,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 39,
-									EndLine:   39,
-									StartPos:  802,
-									EndPos:    806,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 39,
-										EndLine:   39,
-										StartPos:  802,
-										EndPos:    806,
-									},
-								},
-								Value: []byte("$var"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 40,
-						EndLine:   40,
-						StartPos:  809,
-						EndPos:    824,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 40,
-							EndLine:   40,
-							StartPos:  809,
-							EndPos:    823,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 40,
-									EndLine:   40,
-									StartPos:  810,
-									EndPos:    815,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 40,
-									EndLine:   40,
-									StartPos:  815,
-									EndPos:    822,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 40,
-										EndLine:   40,
-										StartPos:  815,
-										EndPos:    819,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 40,
-											EndLine:   40,
-											StartPos:  815,
-											EndPos:    819,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 40,
-										EndLine:   40,
-										StartPos:  820,
-										EndPos:    821,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 41,
-						EndLine:   41,
-						StartPos:  825,
-						EndPos:    841,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 41,
-							EndLine:   41,
-							StartPos:  825,
-							EndPos:    840,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 41,
-									EndLine:   41,
-									StartPos:  826,
-									EndPos:    831,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 41,
-									EndLine:   41,
-									StartPos:  831,
-									EndPos:    839,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 41,
-										EndLine:   41,
-										StartPos:  831,
-										EndPos:    835,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 41,
-											EndLine:   41,
-											StartPos:  831,
-											EndPos:    835,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ExprUnaryMinus{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 41,
-										EndLine:   41,
-										StartPos:  836,
-										EndPos:    838,
-									},
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 41,
-											EndLine:   41,
-											StartPos:  836,
-											EndPos:    838,
-										},
-									},
-									Value: []byte("1"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 42,
-						EndLine:   42,
-						StartPos:  842,
-						EndPos:    896,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 42,
-							EndLine:   42,
-							StartPos:  842,
-							EndPos:    895,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 42,
-									EndLine:   42,
-									StartPos:  843,
-									EndPos:    848,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 42,
-									EndLine:   42,
-									StartPos:  848,
-									EndPos:    894,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 42,
-										EndLine:   42,
-										StartPos:  848,
-										EndPos:    852,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 42,
-											EndLine:   42,
-											StartPos:  848,
-											EndPos:    852,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ScalarString{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 42,
-										EndLine:   42,
-										StartPos:  853,
-										EndPos:    893,
-									},
-								},
-								Value: []byte("1234567890123456789012345678901234567890"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 43,
-						EndLine:   43,
-						StartPos:  897,
-						EndPos:    952,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 43,
-							EndLine:   43,
-							StartPos:  897,
-							EndPos:    951,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 43,
-									EndLine:   43,
-									StartPos:  898,
-									EndPos:    903,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 43,
-									EndLine:   43,
-									StartPos:  903,
-									EndPos:    950,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 43,
-										EndLine:   43,
-										StartPos:  903,
-										EndPos:    907,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 43,
-											EndLine:   43,
-											StartPos:  903,
-											EndPos:    907,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ScalarString{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 43,
-										EndLine:   43,
-										StartPos:  908,
-										EndPos:    949,
-									},
-								},
-								Value: []byte("-1234567890123456789012345678901234567890"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 44,
-						EndLine:   44,
-						StartPos:  953,
-						EndPos:    970,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 44,
-							EndLine:   44,
-							StartPos:  953,
-							EndPos:    969,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 44,
-									EndLine:   44,
-									StartPos:  954,
-									EndPos:    959,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 44,
-									EndLine:   44,
-									StartPos:  959,
-									EndPos:    968,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 44,
-										EndLine:   44,
-										StartPos:  959,
-										EndPos:    963,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 44,
-											EndLine:   44,
-											StartPos:  959,
-											EndPos:    963,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ScalarString{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 44,
-										EndLine:   44,
-										StartPos:  964,
-										EndPos:    967,
-									},
-								},
-								Value: []byte("bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 45,
-						EndLine:   45,
-						StartPos:  971,
-						EndPos:    989,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 45,
-							EndLine:   45,
-							StartPos:  971,
-							EndPos:    988,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 45,
-									EndLine:   45,
-									StartPos:  972,
-									EndPos:    977,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 45,
-									EndLine:   45,
-									StartPos:  977,
-									EndPos:    987,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 45,
-										EndLine:   45,
-										StartPos:  977,
-										EndPos:    981,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 45,
-											EndLine:   45,
-											StartPos:  977,
-											EndPos:    981,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 45,
-										EndLine:   45,
-										StartPos:  982,
-										EndPos:    986,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 45,
-											EndLine:   45,
-											StartPos:  982,
-											EndPos:    986,
-										},
-									},
-									Value: []byte("$bar"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 46,
-						EndLine:   46,
-						StartPos:  990,
-						EndPos:    1002,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 46,
-							EndLine:   46,
-							StartPos:  990,
-							EndPos:    1001,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 46,
-									EndLine:   46,
-									StartPos:  991,
-									EndPos:    995,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 46,
-										EndLine:   46,
-										StartPos:  991,
-										EndPos:    995,
-									},
-								},
-								Value: []byte("$foo"),
-							},
-						},
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 46,
-									EndLine:   46,
-									StartPos:  995,
-									EndPos:    996,
-								},
-							},
-							Value: []byte(" "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 46,
-									EndLine:   46,
-									StartPos:  996,
-									EndPos:    1000,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 46,
-										EndLine:   46,
-										StartPos:  996,
-										EndPos:    1000,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 47,
-						EndLine:   47,
-						StartPos:  1003,
-						EndPos:    1022,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 47,
-							EndLine:   47,
-							StartPos:  1003,
-							EndPos:    1021,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 47,
-									EndLine:   47,
-									StartPos:  1004,
-									EndPos:    1009,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprPropertyFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 47,
-									EndLine:   47,
-									StartPos:  1009,
-									EndPos:    1018,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 47,
-										EndLine:   47,
-										StartPos:  1009,
-										EndPos:    1013,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 47,
-											EndLine:   47,
-											StartPos:  1009,
-											EndPos:    1013,
-										},
-									},
-									Value: []byte("$foo"),
-								},
-							},
-							Property: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 47,
-										EndLine:   47,
-										StartPos:  1015,
-										EndPos:    1018,
-									},
-								},
-								Value: []byte("bar"),
-							},
-						},
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 47,
-									EndLine:   47,
-									StartPos:  1018,
-									EndPos:    1020,
-								},
-							},
-							Value: []byte("()"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 48,
-						EndLine:   48,
-						StartPos:  1023,
-						EndPos:    1037,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 48,
-							EndLine:   48,
-							StartPos:  1023,
-							EndPos:    1036,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 48,
-									EndLine:   48,
-									StartPos:  1024,
-									EndPos:    1029,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 48,
-									EndLine:   48,
-									StartPos:  1029,
-									EndPos:    1035,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 48,
-										EndLine:   48,
-										StartPos:  1031,
-										EndPos:    1034,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 49,
-						EndLine:   49,
-						StartPos:  1038,
-						EndPos:    1055,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 49,
-							EndLine:   49,
-							StartPos:  1038,
-							EndPos:    1054,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 49,
-									EndLine:   49,
-									StartPos:  1039,
-									EndPos:    1044,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 49,
-									EndLine:   49,
-									StartPos:  1044,
-									EndPos:    1053,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 49,
-										EndLine:   49,
-										StartPos:  1046,
-										EndPos:    1049,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 49,
-											EndLine:   49,
-											StartPos:  1046,
-											EndPos:    1049,
-										},
-									},
-									Value: []byte("foo"),
-								},
-							},
-							Dim: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 49,
-										EndLine:   49,
-										StartPos:  1050,
-										EndPos:    1051,
-									},
-								},
-								Value: []byte("0"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 50,
-						EndLine:   50,
-						StartPos:  1056,
-						EndPos:    1071,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 50,
-							EndLine:   50,
-							StartPos:  1056,
-							EndPos:    1070,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 50,
-									EndLine:   50,
-									StartPos:  1057,
-									EndPos:    1062,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 50,
-									EndLine:   50,
-									StartPos:  1062,
-									EndPos:    1069,
-								},
-							},
-							VarName: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 50,
-										EndLine:   50,
-										StartPos:  1064,
-										EndPos:    1068,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 50,
-											EndLine:   50,
-											StartPos:  1064,
-											EndPos:    1068,
-										},
-									},
-									Value: []byte("$foo"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 51,
-						EndLine:   51,
-						StartPos:  1072,
-						EndPos:    1093,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 51,
-							EndLine:   51,
-							StartPos:  1072,
-							EndPos:    1092,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 51,
-									EndLine:   51,
-									StartPos:  1073,
-									EndPos:    1078,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprMethodCall{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 51,
-									EndLine:   51,
-									StartPos:  1079,
-									EndPos:    1090,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 51,
-										EndLine:   51,
-										StartPos:  1079,
-										EndPos:    1083,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 51,
-											EndLine:   51,
-											StartPos:  1079,
-											EndPos:    1083,
-										},
-									},
-									Value: []byte("$foo"),
-								},
-							},
-							Method: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 51,
-										EndLine:   51,
-										StartPos:  1085,
-										EndPos:    1088,
-									},
-								},
-								Value: []byte("bar"),
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 51,
-										EndLine:   51,
-										StartPos:  1088,
-										EndPos:    1090,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 53,
-						EndLine:   54,
-						StartPos:  1095,
-						EndPos:    1111,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 53,
-							EndLine:   53,
-							StartPos:  1099,
-							EndPos:    1101,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 53,
-								EndLine:   53,
-								StartPos:  1099,
-								EndPos:    1101,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 55,
-						EndLine:   57,
-						StartPos:  1112,
-						EndPos:    1141,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 55,
-							EndLine:   55,
-							StartPos:  1116,
-							EndPos:    1118,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 55,
-								EndLine:   55,
-								StartPos:  1116,
-								EndPos:    1118,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				ElseIf: []ast.Vertex{
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 56,
-								EndLine:   -1,
-								StartPos:  1122,
-								EndPos:    -1,
-							},
-						},
-						Alt: true,
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 56,
-									EndLine:   56,
-									StartPos:  1130,
-									EndPos:    1132,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 56,
-										EndLine:   56,
-										StartPos:  1130,
-										EndPos:    1132,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: -1,
-									EndLine:   -1,
-									StartPos:  -1,
-									EndPos:    -1,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 58,
-						EndLine:   60,
-						StartPos:  1142,
-						EndPos:    1164,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 58,
-							EndLine:   58,
-							StartPos:  1146,
-							EndPos:    1148,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 58,
-								EndLine:   58,
-								StartPos:  1146,
-								EndPos:    1148,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 59,
-							EndLine:   -1,
-							StartPos:  1152,
-							EndPos:    -1,
-						},
-					},
-					Alt: true,
-					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: -1,
-								EndLine:   -1,
-								StartPos:  -1,
-								EndPos:    -1,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 61,
-						EndLine:   65,
-						StartPos:  1165,
-						EndPos:    1213,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 61,
-							EndLine:   61,
-							StartPos:  1169,
-							EndPos:    1171,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 61,
-								EndLine:   61,
-								StartPos:  1169,
-								EndPos:    1171,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				ElseIf: []ast.Vertex{
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 62,
-								EndLine:   -1,
-								StartPos:  1175,
-								EndPos:    -1,
-							},
-						},
-						Alt: true,
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 62,
-									EndLine:   62,
-									StartPos:  1183,
-									EndPos:    1185,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 62,
-										EndLine:   62,
-										StartPos:  1183,
-										EndPos:    1185,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: -1,
-									EndLine:   -1,
-									StartPos:  -1,
-									EndPos:    -1,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 63,
-								EndLine:   -1,
-								StartPos:  1188,
-								EndPos:    -1,
-							},
-						},
-						Alt: true,
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 63,
-									EndLine:   63,
-									StartPos:  1196,
-									EndPos:    1198,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 63,
-										EndLine:   63,
-										StartPos:  1196,
-										EndPos:    1198,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: -1,
-									EndLine:   -1,
-									StartPos:  -1,
-									EndPos:    -1,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 64,
-							EndLine:   -1,
-							StartPos:  1201,
-							EndPos:    -1,
-						},
-					},
-					Alt: true,
-					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: -1,
-								EndLine:   -1,
-								StartPos:  -1,
-								EndPos:    -1,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 67,
-						EndLine:   67,
-						StartPos:  1215,
-						EndPos:    1235,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 67,
-							EndLine:   67,
-							StartPos:  1222,
-							EndPos:    1223,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 67,
-							EndLine:   67,
-							StartPos:  1225,
-							EndPos:    1235,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtBreak{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 67,
-									EndLine:   67,
-									StartPos:  1227,
-									EndPos:    1233,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 68,
-						EndLine:   68,
-						StartPos:  1236,
-						EndPos:    1258,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 68,
-							EndLine:   68,
-							StartPos:  1243,
-							EndPos:    1244,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 68,
-							EndLine:   68,
-							StartPos:  1246,
-							EndPos:    1258,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtBreak{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 68,
-									EndLine:   68,
-									StartPos:  1248,
-									EndPos:    1256,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 68,
-										EndLine:   68,
-										StartPos:  1254,
-										EndPos:    1255,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 69,
-						EndLine:   69,
-						StartPos:  1259,
-						EndPos:    1290,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 69,
-							EndLine:   69,
-							StartPos:  1266,
-							EndPos:    1267,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 69,
-							EndLine:   69,
-							StartPos:  1271,
-							EndPos:    1280,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtBreak{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 69,
-									EndLine:   69,
-									StartPos:  1271,
-									EndPos:    1280,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 69,
-										EndLine:   69,
-										StartPos:  1277,
-										EndPos:    1278,
-									},
-								},
-								Value: []byte("3"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 70,
-						EndLine:   70,
-						StartPos:  1291,
-						EndPos:    1334,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 70,
-							EndLine:   70,
-							StartPos:  1297,
-							EndPos:    1300,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassConstList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 70,
-								EndLine:   70,
-								StartPos:  1302,
-								EndPos:    1332,
-							},
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 70,
-										EndLine:   70,
-										StartPos:  1302,
-										EndPos:    1308,
-									},
-								},
-								Value: []byte("public"),
-							},
-						},
-						Consts: []ast.Vertex{
-							&ast.StmtConstant{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 70,
-										EndLine:   70,
-										StartPos:  1315,
-										EndPos:    1322,
-									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 70,
-											EndLine:   70,
-											StartPos:  1315,
-											EndPos:    1318,
-										},
-									},
-									Value: []byte("FOO"),
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 70,
-											EndLine:   70,
-											StartPos:  1321,
-											EndPos:    1322,
-										},
-									},
-									Value: []byte("1"),
-								},
-							},
-							&ast.StmtConstant{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 70,
-										EndLine:   70,
-										StartPos:  1324,
-										EndPos:    1331,
-									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 70,
-											EndLine:   70,
-											StartPos:  1324,
-											EndPos:    1327,
-										},
-									},
-									Value: []byte("BAR"),
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 70,
-											EndLine:   70,
-											StartPos:  1330,
-											EndPos:    1331,
-										},
-									},
-									Value: []byte("2"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 71,
-						EndLine:   71,
-						StartPos:  1335,
-						EndPos:    1371,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 71,
-							EndLine:   71,
-							StartPos:  1341,
-							EndPos:    1344,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassConstList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 71,
-								EndLine:   71,
-								StartPos:  1346,
-								EndPos:    1369,
-							},
-						},
-						Consts: []ast.Vertex{
-							&ast.StmtConstant{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 71,
-										EndLine:   71,
-										StartPos:  1352,
-										EndPos:    1359,
-									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 71,
-											EndLine:   71,
-											StartPos:  1352,
-											EndPos:    1355,
-										},
-									},
-									Value: []byte("FOO"),
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 71,
-											EndLine:   71,
-											StartPos:  1358,
-											EndPos:    1359,
-										},
-									},
-									Value: []byte("1"),
-								},
-							},
-							&ast.StmtConstant{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 71,
-										EndLine:   71,
-										StartPos:  1361,
-										EndPos:    1368,
-									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 71,
-											EndLine:   71,
-											StartPos:  1361,
-											EndPos:    1364,
-										},
-									},
-									Value: []byte("BAR"),
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 71,
-											EndLine:   71,
-											StartPos:  1367,
-											EndPos:    1368,
-										},
-									},
-									Value: []byte("2"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 72,
-						EndLine:   72,
-						StartPos:  1372,
-						EndPos:    1402,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 72,
-							EndLine:   72,
-							StartPos:  1378,
-							EndPos:    1381,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 72,
-								EndLine:   72,
-								StartPos:  1383,
-								EndPos:    1400,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 72,
-									EndLine:   72,
-									StartPos:  1392,
-									EndPos:    1395,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 72,
-									EndLine:   72,
-									StartPos:  1398,
-									EndPos:    1400,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 73,
-						EndLine:   73,
-						StartPos:  1403,
-						EndPos:    1448,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 73,
-							EndLine:   73,
-							StartPos:  1409,
-							EndPos:    1412,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 73,
-								EndLine:   73,
-								StartPos:  1414,
-								EndPos:    1446,
-							},
-						},
-						ReturnsRef: true,
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 73,
-									EndLine:   73,
-									StartPos:  1438,
-									EndPos:    1441,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 73,
-										EndLine:   73,
-										StartPos:  1414,
-										EndPos:    1420,
-									},
-								},
-								Value: []byte("public"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 73,
-										EndLine:   73,
-										StartPos:  1421,
-										EndPos:    1427,
-									},
-								},
-								Value: []byte("static"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 73,
-									EndLine:   73,
-									StartPos:  1444,
-									EndPos:    1446,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 74,
-						EndLine:   74,
-						StartPos:  1449,
-						EndPos:    1500,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 74,
-							EndLine:   74,
-							StartPos:  1455,
-							EndPos:    1458,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 74,
-								EndLine:   74,
-								StartPos:  1460,
-								EndPos:    1498,
-							},
-						},
-						ReturnsRef: true,
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 74,
-									EndLine:   74,
-									StartPos:  1484,
-									EndPos:    1487,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 74,
-										EndLine:   74,
-										StartPos:  1460,
-										EndPos:    1466,
-									},
-								},
-								Value: []byte("public"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 74,
-										EndLine:   74,
-										StartPos:  1467,
-										EndPos:    1473,
-									},
-								},
-								Value: []byte("static"),
-							},
-						},
-						ReturnType: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 74,
-									EndLine:   74,
-									StartPos:  1491,
-									EndPos:    1495,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 74,
-											EndLine:   74,
-											StartPos:  1491,
-											EndPos:    1495,
-										},
-									},
-									Value: []byte("void"),
-								},
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 74,
-									EndLine:   74,
-									StartPos:  1496,
-									EndPos:    1498,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 75,
-						EndLine:   75,
-						StartPos:  1501,
-						EndPos:    1522,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 75,
-							EndLine:   75,
-							StartPos:  1516,
-							EndPos:    1519,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 75,
-								EndLine:   75,
-								StartPos:  1501,
-								EndPos:    1509,
-							},
-						},
-						Value: []byte("abstract"),
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 76,
-						EndLine:   76,
-						StartPos:  1523,
-						EndPos:    1554,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 76,
-							EndLine:   76,
-							StartPos:  1535,
-							EndPos:    1538,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 76,
-								EndLine:   76,
-								StartPos:  1523,
-								EndPos:    1528,
-							},
-						},
-						Value: []byte("final"),
-					},
-				},
-				Extends: &ast.StmtClassExtends{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 76,
-							EndLine:   76,
-							StartPos:  1539,
-							EndPos:    1550,
-						},
-					},
-					ClassName: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 76,
-								EndLine:   76,
-								StartPos:  1547,
-								EndPos:    1550,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 76,
-										EndLine:   76,
-										StartPos:  1547,
-										EndPos:    1550,
-									},
-								},
-								Value: []byte("bar"),
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 77,
-						EndLine:   77,
-						StartPos:  1555,
-						EndPos:    1589,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 77,
-							EndLine:   77,
-							StartPos:  1567,
-							EndPos:    1570,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 77,
-								EndLine:   77,
-								StartPos:  1555,
-								EndPos:    1560,
-							},
-						},
-						Value: []byte("final"),
-					},
-				},
-				Implements: &ast.StmtClassImplements{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 77,
-							EndLine:   77,
-							StartPos:  1571,
-							EndPos:    1585,
-						},
-					},
-					InterfaceNames: []ast.Vertex{
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 77,
-									EndLine:   77,
-									StartPos:  1582,
-									EndPos:    1585,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 77,
-											EndLine:   77,
-											StartPos:  1582,
-											EndPos:    1585,
-										},
-									},
-									Value: []byte("bar"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 78,
-						EndLine:   78,
-						StartPos:  1590,
-						EndPos:    1629,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 78,
-							EndLine:   78,
-							StartPos:  1602,
-							EndPos:    1605,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 78,
-								EndLine:   78,
-								StartPos:  1590,
-								EndPos:    1595,
-							},
-						},
-						Value: []byte("final"),
-					},
-				},
-				Implements: &ast.StmtClassImplements{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 78,
-							EndLine:   78,
-							StartPos:  1606,
-							EndPos:    1625,
-						},
-					},
-					InterfaceNames: []ast.Vertex{
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 78,
-									EndLine:   78,
-									StartPos:  1617,
-									EndPos:    1620,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 78,
-											EndLine:   78,
-											StartPos:  1617,
-											EndPos:    1620,
-										},
-									},
-									Value: []byte("bar"),
-								},
-							},
-						},
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 78,
-									EndLine:   78,
-									StartPos:  1622,
-									EndPos:    1625,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 78,
-											EndLine:   78,
-											StartPos:  1622,
-											EndPos:    1625,
-										},
-									},
-									Value: []byte("baz"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 79,
-						EndLine:   79,
-						StartPos:  1630,
-						EndPos:    1678,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 79,
-							EndLine:   79,
-							StartPos:  1630,
-							EndPos:    1677,
-						},
-					},
-					Class: &ast.StmtClass{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 79,
-								EndLine:   79,
-								StartPos:  1634,
-								EndPos:    1677,
-							},
-						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 79,
-									EndLine:   79,
-									StartPos:  1639,
-									EndPos:    1641,
-								},
-							},
-						},
-						Extends: &ast.StmtClassExtends{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 79,
-									EndLine:   79,
-									StartPos:  1642,
-									EndPos:    1653,
-								},
-							},
-							ClassName: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 79,
-										EndLine:   79,
-										StartPos:  1650,
-										EndPos:    1653,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 79,
-												EndLine:   79,
-												StartPos:  1650,
-												EndPos:    1653,
-											},
-										},
-										Value: []byte("foo"),
-									},
-								},
-							},
-						},
-						Implements: &ast.StmtClassImplements{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 79,
-									EndLine:   79,
-									StartPos:  1654,
-									EndPos:    1673,
-								},
-							},
-							InterfaceNames: []ast.Vertex{
-								&ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 79,
-											EndLine:   79,
-											StartPos:  1665,
-											EndPos:    1668,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 79,
-													EndLine:   79,
-													StartPos:  1665,
-													EndPos:    1668,
-												},
-											},
-											Value: []byte("bar"),
-										},
-									},
-								},
-								&ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 79,
-											EndLine:   79,
-											StartPos:  1670,
-											EndPos:    1673,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 79,
-													EndLine:   79,
-													StartPos:  1670,
-													EndPos:    1673,
-												},
-											},
-											Value: []byte("baz"),
-										},
-									},
-								},
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtConstList{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 81,
-						EndLine:   81,
-						StartPos:  1680,
-						EndPos:    1703,
-					},
-				},
-				Consts: []ast.Vertex{
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 81,
-								EndLine:   81,
-								StartPos:  1686,
-								EndPos:    1693,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 81,
-									EndLine:   81,
-									StartPos:  1686,
-									EndPos:    1689,
-								},
-							},
-							Value: []byte("FOO"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 81,
-									EndLine:   81,
-									StartPos:  1692,
-									EndPos:    1693,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 81,
-								EndLine:   81,
-								StartPos:  1695,
-								EndPos:    1702,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 81,
-									EndLine:   81,
-									StartPos:  1695,
-									EndPos:    1698,
-								},
-							},
-							Value: []byte("BAR"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 81,
-									EndLine:   81,
-									StartPos:  1701,
-									EndPos:    1702,
-								},
-							},
-							Value: []byte("2"),
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 82,
-						EndLine:   82,
-						StartPos:  1704,
-						EndPos:    1727,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 82,
-							EndLine:   82,
-							StartPos:  1711,
-							EndPos:    1712,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 82,
-							EndLine:   82,
-							StartPos:  1714,
-							EndPos:    1727,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtContinue{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 82,
-									EndLine:   82,
-									StartPos:  1716,
-									EndPos:    1725,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 83,
-						EndLine:   83,
-						StartPos:  1728,
-						EndPos:    1753,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 83,
-							EndLine:   83,
-							StartPos:  1735,
-							EndPos:    1736,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 83,
-							EndLine:   83,
-							StartPos:  1738,
-							EndPos:    1753,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtContinue{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 83,
-									EndLine:   83,
-									StartPos:  1740,
-									EndPos:    1751,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 83,
-										EndLine:   83,
-										StartPos:  1749,
-										EndPos:    1750,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 84,
-						EndLine:   84,
-						StartPos:  1754,
-						EndPos:    1780,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 84,
-							EndLine:   84,
-							StartPos:  1761,
-							EndPos:    1762,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 84,
-							EndLine:   84,
-							StartPos:  1764,
-							EndPos:    1780,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtContinue{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 84,
-									EndLine:   84,
-									StartPos:  1766,
-									EndPos:    1778,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 84,
-										EndLine:   84,
-										StartPos:  1775,
-										EndPos:    1776,
-									},
-								},
-								Value: []byte("3"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtDeclare{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 85,
-						EndLine:   85,
-						StartPos:  1781,
-						EndPos:    1798,
-					},
-				},
-				Consts: []ast.Vertex{
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 85,
-								EndLine:   85,
-								StartPos:  1789,
-								EndPos:    1796,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 85,
-									EndLine:   85,
-									StartPos:  1789,
-									EndPos:    1794,
-								},
-							},
-							Value: []byte("ticks"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 85,
-									EndLine:   85,
-									StartPos:  1795,
-									EndPos:    1796,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-				Stmt: &ast.StmtNop{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 85,
-							EndLine:   85,
-							StartPos:  1797,
-							EndPos:    1798,
-						},
-					},
-				},
-			},
-			&ast.StmtDeclare{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 86,
-						EndLine:   86,
-						StartPos:  1799,
-						EndPos:    1818,
-					},
-				},
-				Consts: []ast.Vertex{
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 86,
-								EndLine:   86,
-								StartPos:  1807,
-								EndPos:    1814,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 86,
-									EndLine:   86,
-									StartPos:  1807,
-									EndPos:    1812,
-								},
-							},
-							Value: []byte("ticks"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 86,
-									EndLine:   86,
-									StartPos:  1813,
-									EndPos:    1814,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 86,
-							EndLine:   86,
-							StartPos:  1816,
-							EndPos:    1818,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtDeclare{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 87,
-						EndLine:   87,
-						StartPos:  1819,
-						EndPos:    1848,
-					},
-				},
-				Alt: true,
-				Consts: []ast.Vertex{
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 87,
-								EndLine:   87,
-								StartPos:  1827,
-								EndPos:    1834,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 87,
-									EndLine:   87,
-									StartPos:  1827,
-									EndPos:    1832,
-								},
-							},
-							Value: []byte("ticks"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 87,
-									EndLine:   87,
-									StartPos:  1833,
-									EndPos:    1834,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtDo{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 88,
-						EndLine:   88,
-						StartPos:  1849,
-						EndPos:    1864,
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 88,
-							EndLine:   88,
-							StartPos:  1852,
-							EndPos:    1854,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 88,
-							EndLine:   88,
-							StartPos:  1861,
-							EndPos:    1862,
-						},
-					},
-					Value: []byte("1"),
-				},
-			},
-			&ast.StmtEcho{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 89,
-						EndLine:   89,
-						StartPos:  1865,
-						EndPos:    1876,
-					},
-				},
-				Exprs: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 89,
-								EndLine:   89,
-								StartPos:  1870,
-								EndPos:    1872,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 89,
-									EndLine:   89,
-									StartPos:  1870,
-									EndPos:    1872,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					&ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 89,
-								EndLine:   89,
-								StartPos:  1874,
-								EndPos:    1875,
-							},
-						},
-						Value: []byte("1"),
-					},
-				},
-			},
-			&ast.StmtEcho{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 90,
-						EndLine:   90,
-						StartPos:  1877,
-						EndPos:    1886,
-					},
-				},
-				Exprs: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 90,
-								EndLine:   90,
-								StartPos:  1882,
-								EndPos:    1884,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 90,
-									EndLine:   90,
-									StartPos:  1882,
-									EndPos:    1884,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtFor{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 91,
-						EndLine:   91,
-						StartPos:  1887,
-						EndPos:    1922,
-					},
-				},
-				Init: []ast.Vertex{
-					&ast.ExprAssign{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 91,
-								EndLine:   91,
-								StartPos:  1891,
-								EndPos:    1897,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 91,
-									EndLine:   91,
-									StartPos:  1891,
-									EndPos:    1893,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 91,
-										EndLine:   91,
-										StartPos:  1891,
-										EndPos:    1893,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 91,
-									EndLine:   91,
-									StartPos:  1896,
-									EndPos:    1897,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-				},
-				Cond: []ast.Vertex{
-					&ast.ExprBinarySmaller{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 91,
-								EndLine:   91,
-								StartPos:  1899,
-								EndPos:    1906,
-							},
-						},
-						Left: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 91,
-									EndLine:   91,
-									StartPos:  1899,
-									EndPos:    1901,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 91,
-										EndLine:   91,
-										StartPos:  1899,
-										EndPos:    1901,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-						Right: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 91,
-									EndLine:   91,
-									StartPos:  1904,
-									EndPos:    1906,
-								},
-							},
-							Value: []byte("10"),
-						},
-					},
-				},
-				Loop: []ast.Vertex{
-					&ast.ExprPostInc{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 91,
-								EndLine:   91,
-								StartPos:  1908,
-								EndPos:    1912,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 91,
-									EndLine:   91,
-									StartPos:  1908,
-									EndPos:    1910,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 91,
-										EndLine:   91,
-										StartPos:  1908,
-										EndPos:    1910,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-					},
-					&ast.ExprPostInc{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 91,
-								EndLine:   91,
-								StartPos:  1914,
-								EndPos:    1918,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 91,
-									EndLine:   91,
-									StartPos:  1914,
-									EndPos:    1916,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 91,
-										EndLine:   91,
-										StartPos:  1914,
-										EndPos:    1916,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 91,
-							EndLine:   91,
-							StartPos:  1920,
-							EndPos:    1922,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtFor{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 92,
-						EndLine:   92,
-						StartPos:  1923,
-						EndPos:    1959,
-					},
-				},
-				Alt: true,
-				Cond: []ast.Vertex{
-					&ast.ExprBinarySmaller{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 92,
-								EndLine:   92,
-								StartPos:  1929,
-								EndPos:    1936,
-							},
-						},
-						Left: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 92,
-									EndLine:   92,
-									StartPos:  1929,
-									EndPos:    1931,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 92,
-										EndLine:   92,
-										StartPos:  1929,
-										EndPos:    1931,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-						Right: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 92,
-									EndLine:   92,
-									StartPos:  1934,
-									EndPos:    1936,
-								},
-							},
-							Value: []byte("10"),
-						},
-					},
-				},
-				Loop: []ast.Vertex{
-					&ast.ExprPostInc{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 92,
-								EndLine:   92,
-								StartPos:  1938,
-								EndPos:    1942,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 92,
-									EndLine:   92,
-									StartPos:  1938,
-									EndPos:    1940,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 92,
-										EndLine:   92,
-										StartPos:  1938,
-										EndPos:    1940,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-					},
-					&ast.ExprPostInc{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 92,
-								EndLine:   92,
-								StartPos:  1944,
-								EndPos:    1948,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 92,
-									EndLine:   92,
-									StartPos:  1944,
-									EndPos:    1946,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 92,
-										EndLine:   92,
-										StartPos:  1944,
-										EndPos:    1946,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 93,
-						EndLine:   93,
-						StartPos:  1960,
-						EndPos:    1981,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 93,
-							EndLine:   93,
-							StartPos:  1969,
-							EndPos:    1971,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 93,
-								EndLine:   93,
-								StartPos:  1969,
-								EndPos:    1971,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Var: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 93,
-							EndLine:   93,
-							StartPos:  1975,
-							EndPos:    1977,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 93,
-								EndLine:   93,
-								StartPos:  1975,
-								EndPos:    1977,
-							},
-						},
-						Value: []byte("$v"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 93,
-							EndLine:   93,
-							StartPos:  1979,
-							EndPos:    1981,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 94,
-						EndLine:   94,
-						StartPos:  1982,
-						EndPos:    2014,
-					},
-				},
-				Alt: true,
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 94,
-							EndLine:   94,
-							StartPos:  1991,
-							EndPos:    1993,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 94,
-								EndLine:   94,
-								StartPos:  1991,
-								EndPos:    1993,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Var: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 94,
-							EndLine:   94,
-							StartPos:  1997,
-							EndPos:    1999,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 94,
-								EndLine:   94,
-								StartPos:  1997,
-								EndPos:    1999,
-							},
-						},
-						Value: []byte("$v"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: -1,
-							EndLine:   -1,
-							StartPos:  -1,
-							EndPos:    -1,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 95,
-						EndLine:   95,
-						StartPos:  2015,
-						EndPos:    2042,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 95,
-							EndLine:   95,
-							StartPos:  2024,
-							EndPos:    2026,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 95,
-								EndLine:   95,
-								StartPos:  2024,
-								EndPos:    2026,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Key: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 95,
-							EndLine:   95,
-							StartPos:  2030,
-							EndPos:    2032,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 95,
-								EndLine:   95,
-								StartPos:  2030,
-								EndPos:    2032,
-							},
-						},
-						Value: []byte("$k"),
-					},
-				},
-				Var: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 95,
-							EndLine:   95,
-							StartPos:  2036,
-							EndPos:    2038,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 95,
-								EndLine:   95,
-								StartPos:  2036,
-								EndPos:    2038,
-							},
-						},
-						Value: []byte("$v"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 95,
-							EndLine:   95,
-							StartPos:  2040,
-							EndPos:    2042,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 96,
-						EndLine:   96,
-						StartPos:  2043,
-						EndPos:    2071,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 96,
-							EndLine:   96,
-							StartPos:  2052,
-							EndPos:    2054,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 96,
-								EndLine:   96,
-								StartPos:  2052,
-								EndPos:    2054,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Key: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 96,
-							EndLine:   96,
-							StartPos:  2058,
-							EndPos:    2060,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 96,
-								EndLine:   96,
-								StartPos:  2058,
-								EndPos:    2060,
-							},
-						},
-						Value: []byte("$k"),
-					},
-				},
-				Var: &ast.ExprReference{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 96,
-							EndLine:   96,
-							StartPos:  2064,
-							EndPos:    2067,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 96,
-								EndLine:   96,
-								StartPos:  2065,
-								EndPos:    2067,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 96,
-									EndLine:   96,
-									StartPos:  2065,
-									EndPos:    2067,
-								},
-							},
-							Value: []byte("$v"),
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 96,
-							EndLine:   96,
-							StartPos:  2069,
-							EndPos:    2071,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 97,
-						EndLine:   97,
-						StartPos:  2072,
-						EndPos:    2105,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 97,
-							EndLine:   97,
-							StartPos:  2081,
-							EndPos:    2083,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 97,
-								EndLine:   97,
-								StartPos:  2081,
-								EndPos:    2083,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Key: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 97,
-							EndLine:   97,
-							StartPos:  2087,
-							EndPos:    2089,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 97,
-								EndLine:   97,
-								StartPos:  2087,
-								EndPos:    2089,
-							},
-						},
-						Value: []byte("$k"),
-					},
-				},
-				Var: &ast.ExprList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 97,
-							EndLine:   97,
-							StartPos:  2093,
-							EndPos:    2101,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 97,
-									EndLine:   97,
-									StartPos:  2098,
-									EndPos:    2100,
-								},
-							},
-							Val: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 97,
-										EndLine:   97,
-										StartPos:  2098,
-										EndPos:    2100,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 97,
-											EndLine:   97,
-											StartPos:  2098,
-											EndPos:    2100,
-										},
-									},
-									Value: []byte("$v"),
-								},
-							},
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 97,
-							EndLine:   97,
-							StartPos:  2103,
-							EndPos:    2105,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 98,
-						EndLine:   98,
-						StartPos:  2106,
-						EndPos:    2135,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 98,
-							EndLine:   98,
-							StartPos:  2115,
-							EndPos:    2117,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 98,
-								EndLine:   98,
-								StartPos:  2115,
-								EndPos:    2117,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Key: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 98,
-							EndLine:   98,
-							StartPos:  2121,
-							EndPos:    2123,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 98,
-								EndLine:   98,
-								StartPos:  2121,
-								EndPos:    2123,
-							},
-						},
-						Value: []byte("$k"),
-					},
-				},
-				Var: &ast.ExprShortList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 98,
-							EndLine:   98,
-							StartPos:  2127,
-							EndPos:    2131,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 98,
-									EndLine:   98,
-									StartPos:  2128,
-									EndPos:    2130,
-								},
-							},
-							Val: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 98,
-										EndLine:   98,
-										StartPos:  2128,
-										EndPos:    2130,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 98,
-											EndLine:   98,
-											StartPos:  2128,
-											EndPos:    2130,
-										},
-									},
-									Value: []byte("$v"),
-								},
-							},
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 98,
-							EndLine:   98,
-							StartPos:  2133,
-							EndPos:    2135,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 99,
-						EndLine:   99,
-						StartPos:  2136,
-						EndPos:    2153,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 99,
-							EndLine:   99,
-							StartPos:  2145,
-							EndPos:    2148,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 100,
-						EndLine:   100,
-						StartPos:  2154,
-						EndPos:    2178,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 100,
-							EndLine:   100,
-							StartPos:  2163,
-							EndPos:    2166,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtReturn{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 100,
-								EndLine:   100,
-								StartPos:  2170,
-								EndPos:    2177,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 101,
-						EndLine:   101,
-						StartPos:  2179,
-						EndPos:    2206,
-					},
-				},
-				ReturnsRef: true,
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 101,
-							EndLine:   101,
-							StartPos:  2189,
-							EndPos:    2192,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtReturn{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 101,
-								EndLine:   101,
-								StartPos:  2196,
-								EndPos:    2205,
-							},
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 101,
-									EndLine:   101,
-									StartPos:  2203,
-									EndPos:    2204,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 102,
-						EndLine:   102,
-						StartPos:  2207,
-						EndPos:    2231,
-					},
-				},
-				ReturnsRef: true,
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 102,
-							EndLine:   102,
-							StartPos:  2217,
-							EndPos:    2220,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				ReturnType: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 102,
-							EndLine:   102,
-							StartPos:  2224,
-							EndPos:    2228,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 102,
-									EndLine:   102,
-									StartPos:  2224,
-									EndPos:    2228,
-								},
-							},
-							Value: []byte("void"),
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtGlobal{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 103,
-						EndLine:   103,
-						StartPos:  2232,
-						EndPos:    2246,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 103,
-								EndLine:   103,
-								StartPos:  2239,
-								EndPos:    2241,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 103,
-									EndLine:   103,
-									StartPos:  2239,
-									EndPos:    2241,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 103,
-								EndLine:   103,
-								StartPos:  2243,
-								EndPos:    2245,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 103,
-									EndLine:   103,
-									StartPos:  2243,
-									EndPos:    2245,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtLabel{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 104,
-						EndLine:   104,
-						StartPos:  2247,
-						EndPos:    2249,
-					},
-				},
-				LabelName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 104,
-							EndLine:   104,
-							StartPos:  2247,
-							EndPos:    2248,
-						},
-					},
-					Value: []byte("a"),
-				},
-			},
-			&ast.StmtGoto{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 105,
-						EndLine:   105,
-						StartPos:  2250,
-						EndPos:    2257,
-					},
-				},
-				Label: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 105,
-							EndLine:   105,
-							StartPos:  2255,
-							EndPos:    2256,
-						},
-					},
-					Value: []byte("a"),
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 106,
-						EndLine:   106,
-						StartPos:  2258,
-						EndPos:    2268,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 106,
-							EndLine:   106,
-							StartPos:  2262,
-							EndPos:    2264,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 106,
-								EndLine:   106,
-								StartPos:  2262,
-								EndPos:    2264,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 106,
-							EndLine:   106,
-							StartPos:  2266,
-							EndPos:    2268,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 107,
-						EndLine:   107,
-						StartPos:  2269,
-						EndPos:    2294,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 107,
-							EndLine:   107,
-							StartPos:  2273,
-							EndPos:    2275,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 107,
-								EndLine:   107,
-								StartPos:  2273,
-								EndPos:    2275,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 107,
-							EndLine:   107,
-							StartPos:  2277,
-							EndPos:    2279,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				ElseIf: []ast.Vertex{
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 107,
-								EndLine:   107,
-								StartPos:  2280,
-								EndPos:    2294,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 107,
-									EndLine:   107,
-									StartPos:  2288,
-									EndPos:    2290,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 107,
-										EndLine:   107,
-										StartPos:  2288,
-										EndPos:    2290,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 107,
-									EndLine:   107,
-									StartPos:  2292,
-									EndPos:    2294,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 108,
-						EndLine:   108,
-						StartPos:  2295,
-						EndPos:    2313,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 108,
-							EndLine:   108,
-							StartPos:  2299,
-							EndPos:    2301,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 108,
-								EndLine:   108,
-								StartPos:  2299,
-								EndPos:    2301,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 108,
-							EndLine:   108,
-							StartPos:  2303,
-							EndPos:    2305,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 108,
-							EndLine:   108,
-							StartPos:  2306,
-							EndPos:    2313,
-						},
-					},
-					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 108,
-								EndLine:   108,
-								StartPos:  2311,
-								EndPos:    2313,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 109,
-						EndLine:   109,
-						StartPos:  2314,
-						EndPos:    2362,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 109,
-							EndLine:   109,
-							StartPos:  2318,
-							EndPos:    2320,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 109,
-								EndLine:   109,
-								StartPos:  2318,
-								EndPos:    2320,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 109,
-							EndLine:   109,
-							StartPos:  2322,
-							EndPos:    2324,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				ElseIf: []ast.Vertex{
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 109,
-								EndLine:   109,
-								StartPos:  2325,
-								EndPos:    2339,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 109,
-									EndLine:   109,
-									StartPos:  2333,
-									EndPos:    2335,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 109,
-										EndLine:   109,
-										StartPos:  2333,
-										EndPos:    2335,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 109,
-									EndLine:   109,
-									StartPos:  2337,
-									EndPos:    2339,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 109,
-								EndLine:   109,
-								StartPos:  2340,
-								EndPos:    2354,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 109,
-									EndLine:   109,
-									StartPos:  2348,
-									EndPos:    2350,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 109,
-										EndLine:   109,
-										StartPos:  2348,
-										EndPos:    2350,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 109,
-									EndLine:   109,
-									StartPos:  2352,
-									EndPos:    2354,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 109,
-							EndLine:   109,
-							StartPos:  2355,
-							EndPos:    2362,
-						},
-					},
-					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 109,
-								EndLine:   109,
-								StartPos:  2360,
-								EndPos:    2362,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 110,
-						EndLine:   110,
-						StartPos:  2363,
-						EndPos:    2412,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 110,
-							EndLine:   110,
-							StartPos:  2367,
-							EndPos:    2369,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 110,
-								EndLine:   110,
-								StartPos:  2367,
-								EndPos:    2369,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 110,
-							EndLine:   110,
-							StartPos:  2371,
-							EndPos:    2373,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				ElseIf: []ast.Vertex{
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 110,
-								EndLine:   110,
-								StartPos:  2374,
-								EndPos:    2388,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 110,
-									EndLine:   110,
-									StartPos:  2382,
-									EndPos:    2384,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 110,
-										EndLine:   110,
-										StartPos:  2382,
-										EndPos:    2384,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 110,
-									EndLine:   110,
-									StartPos:  2386,
-									EndPos:    2388,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 110,
-							EndLine:   110,
-							StartPos:  2389,
-							EndPos:    2412,
-						},
-					},
-					Stmt: &ast.StmtIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 110,
-								EndLine:   110,
-								StartPos:  2394,
-								EndPos:    2412,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 110,
-									EndLine:   110,
-									StartPos:  2398,
-									EndPos:    2400,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 110,
-										EndLine:   110,
-										StartPos:  2398,
-										EndPos:    2400,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 110,
-									EndLine:   110,
-									StartPos:  2402,
-									EndPos:    2404,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-						Else: &ast.StmtElse{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 110,
-									EndLine:   110,
-									StartPos:  2405,
-									EndPos:    2412,
-								},
-							},
-							Stmt: &ast.StmtStmtList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 110,
-										EndLine:   110,
-										StartPos:  2410,
-										EndPos:    2412,
-									},
-								},
-								Stmts: []ast.Vertex{},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtNop{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 111,
-						EndLine:   111,
-						StartPos:  2413,
-						EndPos:    2415,
-					},
-				},
-			},
-			&ast.StmtInlineHtml{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 111,
-						EndLine:   111,
-						StartPos:  2415,
-						EndPos:    2428,
-					},
-				},
-				Value: []byte(" <div></div> "),
-			},
-			&ast.StmtInterface{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 112,
-						EndLine:   112,
-						StartPos:  2431,
-						EndPos:    2447,
-					},
-				},
-				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 112,
-							EndLine:   112,
-							StartPos:  2441,
-							EndPos:    2444,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtInterface{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 113,
-						EndLine:   113,
-						StartPos:  2448,
-						EndPos:    2476,
-					},
-				},
-				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 113,
-							EndLine:   113,
-							StartPos:  2458,
-							EndPos:    2461,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Extends: &ast.StmtInterfaceExtends{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 113,
-							EndLine:   113,
-							StartPos:  2462,
-							EndPos:    2473,
-						},
-					},
-					InterfaceNames: []ast.Vertex{
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 113,
-									EndLine:   113,
-									StartPos:  2470,
-									EndPos:    2473,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 113,
-											EndLine:   113,
-											StartPos:  2470,
-											EndPos:    2473,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtInterface{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 114,
-						EndLine:   114,
-						StartPos:  2477,
-						EndPos:    2510,
-					},
-				},
-				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 114,
-							EndLine:   114,
-							StartPos:  2487,
-							EndPos:    2490,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Extends: &ast.StmtInterfaceExtends{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 114,
-							EndLine:   114,
-							StartPos:  2491,
-							EndPos:    2507,
-						},
-					},
-					InterfaceNames: []ast.Vertex{
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 114,
-									EndLine:   114,
-									StartPos:  2499,
-									EndPos:    2502,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 114,
-											EndLine:   114,
-											StartPos:  2499,
-											EndPos:    2502,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 114,
-									EndLine:   114,
-									StartPos:  2504,
-									EndPos:    2507,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 114,
-											EndLine:   114,
-											StartPos:  2504,
-											EndPos:    2507,
-										},
-									},
-									Value: []byte("Baz"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtNamespace{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 115,
-						EndLine:   115,
-						StartPos:  2511,
-						EndPos:    2525,
-					},
-				},
-				Name: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 115,
-							EndLine:   115,
-							StartPos:  2521,
-							EndPos:    2524,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 115,
-									EndLine:   115,
-									StartPos:  2521,
-									EndPos:    2524,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-			},
-			&ast.StmtNamespace{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 116,
-						EndLine:   116,
-						StartPos:  2526,
-						EndPos:    2542,
-					},
-				},
-				Name: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 116,
-							EndLine:   116,
-							StartPos:  2536,
-							EndPos:    2539,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 116,
-									EndLine:   116,
-									StartPos:  2536,
-									EndPos:    2539,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtNamespace{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 117,
-						EndLine:   117,
-						StartPos:  2543,
-						EndPos:    2555,
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 118,
-						EndLine:   118,
-						StartPos:  2556,
-						EndPos:    2575,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 118,
-							EndLine:   118,
-							StartPos:  2562,
-							EndPos:    2565,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 118,
-								EndLine:   118,
-								StartPos:  2567,
-								EndPos:    2574,
-							},
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 118,
-										EndLine:   118,
-										StartPos:  2567,
-										EndPos:    2570,
-									},
-								},
-								Value: []byte("var"),
-							},
-						},
-						Properties: []ast.Vertex{
-							&ast.StmtProperty{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 118,
-										EndLine:   118,
-										StartPos:  2571,
-										EndPos:    2573,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 118,
-											EndLine:   118,
-											StartPos:  2571,
-											EndPos:    2573,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 118,
-												EndLine:   118,
-												StartPos:  2571,
-												EndPos:    2573,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 119,
-						EndLine:   119,
-						StartPos:  2576,
-						EndPos:    2613,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 119,
-							EndLine:   119,
-							StartPos:  2582,
-							EndPos:    2585,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 119,
-								EndLine:   119,
-								StartPos:  2587,
-								EndPos:    2612,
-							},
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 119,
-										EndLine:   119,
-										StartPos:  2587,
-										EndPos:    2593,
-									},
-								},
-								Value: []byte("public"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 119,
-										EndLine:   119,
-										StartPos:  2594,
-										EndPos:    2600,
-									},
-								},
-								Value: []byte("static"),
-							},
-						},
-						Properties: []ast.Vertex{
-							&ast.StmtProperty{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 119,
-										EndLine:   119,
-										StartPos:  2601,
-										EndPos:    2603,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 119,
-											EndLine:   119,
-											StartPos:  2601,
-											EndPos:    2603,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 119,
-												EndLine:   119,
-												StartPos:  2601,
-												EndPos:    2603,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.StmtProperty{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 119,
-										EndLine:   119,
-										StartPos:  2605,
-										EndPos:    2611,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 119,
-											EndLine:   119,
-											StartPos:  2605,
-											EndPos:    2607,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 119,
-												EndLine:   119,
-												StartPos:  2605,
-												EndPos:    2607,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 119,
-											EndLine:   119,
-											StartPos:  2610,
-											EndPos:    2611,
-										},
-									},
-									Value: []byte("1"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 120,
-						EndLine:   120,
-						StartPos:  2614,
-						EndPos:    2632,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 120,
-								EndLine:   120,
-								StartPos:  2621,
-								EndPos:    2623,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 120,
-									EndLine:   120,
-									StartPos:  2621,
-									EndPos:    2623,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 120,
-										EndLine:   120,
-										StartPos:  2621,
-										EndPos:    2623,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-					},
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 120,
-								EndLine:   120,
-								StartPos:  2625,
-								EndPos:    2631,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 120,
-									EndLine:   120,
-									StartPos:  2625,
-									EndPos:    2627,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 120,
-										EndLine:   120,
-										StartPos:  2625,
-										EndPos:    2627,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 120,
-									EndLine:   120,
-									StartPos:  2630,
-									EndPos:    2631,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-			},
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 122,
-						EndLine:   126,
-						StartPos:  2634,
-						EndPos:    2694,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 122,
-							EndLine:   122,
-							StartPos:  2642,
-							EndPos:    2643,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 123,
-								EndLine:   -1,
-								StartPos:  2651,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 123,
-									EndLine:   123,
-									StartPos:  2656,
-									EndPos:    2657,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtDefault{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 124,
-								EndLine:   -1,
-								StartPos:  2663,
-								EndPos:    -1,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 125,
-								EndLine:   -1,
-								StartPos:  2676,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 125,
-									EndLine:   125,
-									StartPos:  2681,
-									EndPos:    2682,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 128,
-						EndLine:   131,
-						StartPos:  2696,
-						EndPos:    2744,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 128,
-							EndLine:   128,
-							StartPos:  2704,
-							EndPos:    2705,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 129,
-								EndLine:   -1,
-								StartPos:  2714,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 129,
-									EndLine:   129,
-									StartPos:  2719,
-									EndPos:    2720,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 130,
-								EndLine:   -1,
-								StartPos:  2726,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 130,
-									EndLine:   130,
-									StartPos:  2731,
-									EndPos:    2732,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 133,
-						EndLine:   136,
-						StartPos:  2746,
-						EndPos:    2798,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 133,
-							EndLine:   133,
-							StartPos:  2754,
-							EndPos:    2755,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 134,
-								EndLine:   134,
-								StartPos:  2763,
-								EndPos:    2777,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 134,
-									EndLine:   134,
-									StartPos:  2768,
-									EndPos:    2769,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 134,
-										EndLine:   134,
-										StartPos:  2771,
-										EndPos:    2777,
-									},
-								},
-							},
-						},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 135,
-								EndLine:   135,
-								StartPos:  2782,
-								EndPos:    2796,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 135,
-									EndLine:   135,
-									StartPos:  2787,
-									EndPos:    2788,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 135,
-										EndLine:   135,
-										StartPos:  2790,
-										EndPos:    2796,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 138,
-						EndLine:   141,
-						StartPos:  2800,
-						EndPos:    2853,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 138,
-							EndLine:   138,
-							StartPos:  2808,
-							EndPos:    2809,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 139,
-								EndLine:   139,
-								StartPos:  2818,
-								EndPos:    2832,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 139,
-									EndLine:   139,
-									StartPos:  2823,
-									EndPos:    2824,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 139,
-										EndLine:   139,
-										StartPos:  2826,
-										EndPos:    2832,
-									},
-								},
-							},
-						},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 140,
-								EndLine:   140,
-								StartPos:  2837,
-								EndPos:    2851,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 140,
-									EndLine:   140,
-									StartPos:  2842,
-									EndPos:    2843,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 140,
-										EndLine:   140,
-										StartPos:  2845,
-										EndPos:    2851,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtThrow{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 143,
-						EndLine:   143,
-						StartPos:  2855,
-						EndPos:    2864,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 143,
-							EndLine:   143,
-							StartPos:  2861,
-							EndPos:    2863,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 143,
-								EndLine:   143,
-								StartPos:  2861,
-								EndPos:    2863,
-							},
-						},
-						Value: []byte("$e"),
-					},
-				},
-			},
-			&ast.StmtTrait{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 145,
-						EndLine:   145,
-						StartPos:  2866,
-						EndPos:    2878,
-					},
-				},
-				TraitName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 145,
-							EndLine:   145,
-							StartPos:  2872,
-							EndPos:    2875,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 146,
-						EndLine:   146,
-						StartPos:  2879,
-						EndPos:    2901,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 146,
-							EndLine:   146,
-							StartPos:  2885,
-							EndPos:    2888,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 146,
-								EndLine:   146,
-								StartPos:  2891,
-								EndPos:    2899,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 146,
-										EndLine:   146,
-										StartPos:  2895,
-										EndPos:    2898,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 146,
-												EndLine:   146,
-												StartPos:  2895,
-												EndPos:    2898,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtNop{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 146,
-									EndLine:   146,
-									StartPos:  2898,
-									EndPos:    2899,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 147,
-						EndLine:   147,
-						StartPos:  2902,
-						EndPos:    2931,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 147,
-							EndLine:   147,
-							StartPos:  2908,
-							EndPos:    2911,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 147,
-								EndLine:   147,
-								StartPos:  2914,
-								EndPos:    2929,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 147,
-										EndLine:   147,
-										StartPos:  2918,
-										EndPos:    2921,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 147,
-												EndLine:   147,
-												StartPos:  2918,
-												EndPos:    2921,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 147,
-										EndLine:   147,
-										StartPos:  2923,
-										EndPos:    2926,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 147,
-												EndLine:   147,
-												StartPos:  2923,
-												EndPos:    2926,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 147,
-									EndLine:   147,
-									StartPos:  2927,
-									EndPos:    2929,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 148,
-						EndLine:   148,
-						StartPos:  2932,
-						EndPos:    2978,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 148,
-							EndLine:   148,
-							StartPos:  2938,
-							EndPos:    2941,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 148,
-								EndLine:   148,
-								StartPos:  2944,
-								EndPos:    2976,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 148,
-										EndLine:   148,
-										StartPos:  2948,
-										EndPos:    2951,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 148,
-												EndLine:   148,
-												StartPos:  2948,
-												EndPos:    2951,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 148,
-										EndLine:   148,
-										StartPos:  2953,
-										EndPos:    2956,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 148,
-												EndLine:   148,
-												StartPos:  2953,
-												EndPos:    2956,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 148,
-									EndLine:   148,
-									StartPos:  2957,
-									EndPos:    2976,
-								},
-							},
-							Adaptations: []ast.Vertex{
-								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 148,
-											EndLine:   148,
-											StartPos:  2959,
-											EndPos:    2973,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 148,
-												EndLine:   148,
-												StartPos:  2959,
-												EndPos:    2962,
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 148,
-													EndLine:   148,
-													StartPos:  2959,
-													EndPos:    2962,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Alias: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 148,
-												EndLine:   148,
-												StartPos:  2966,
-												EndPos:    2973,
-											},
-										},
-										Value: []byte("include"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 149,
-						EndLine:   149,
-						StartPos:  2979,
-						EndPos:    3024,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 149,
-							EndLine:   149,
-							StartPos:  2985,
-							EndPos:    2988,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 149,
-								EndLine:   149,
-								StartPos:  2991,
-								EndPos:    3022,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 149,
-										EndLine:   149,
-										StartPos:  2995,
-										EndPos:    2998,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 149,
-												EndLine:   149,
-												StartPos:  2995,
-												EndPos:    2998,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 149,
-										EndLine:   149,
-										StartPos:  3000,
-										EndPos:    3003,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 149,
-												EndLine:   149,
-												StartPos:  3000,
-												EndPos:    3003,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 149,
-									EndLine:   149,
-									StartPos:  3004,
-									EndPos:    3022,
-								},
-							},
-							Adaptations: []ast.Vertex{
-								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 149,
-											EndLine:   149,
-											StartPos:  3006,
-											EndPos:    3019,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 149,
-												EndLine:   149,
-												StartPos:  3006,
-												EndPos:    3009,
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 149,
-													EndLine:   149,
-													StartPos:  3006,
-													EndPos:    3009,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Modifier: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 149,
-												EndLine:   149,
-												StartPos:  3013,
-												EndPos:    3019,
-											},
-										},
-										Value: []byte("public"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 150,
-						EndLine:   150,
-						StartPos:  3025,
-						EndPos:    3074,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 150,
-							EndLine:   150,
-							StartPos:  3031,
-							EndPos:    3034,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 150,
-								EndLine:   150,
-								StartPos:  3037,
-								EndPos:    3072,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 150,
-										EndLine:   150,
-										StartPos:  3041,
-										EndPos:    3044,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 150,
-												EndLine:   150,
-												StartPos:  3041,
-												EndPos:    3044,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 150,
-										EndLine:   150,
-										StartPos:  3046,
-										EndPos:    3049,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 150,
-												EndLine:   150,
-												StartPos:  3046,
-												EndPos:    3049,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 150,
-									EndLine:   150,
-									StartPos:  3050,
-									EndPos:    3072,
-								},
-							},
-							Adaptations: []ast.Vertex{
-								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 150,
-											EndLine:   150,
-											StartPos:  3052,
-											EndPos:    3069,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 150,
-												EndLine:   150,
-												StartPos:  3052,
-												EndPos:    3055,
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 150,
-													EndLine:   150,
-													StartPos:  3052,
-													EndPos:    3055,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Modifier: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 150,
-												EndLine:   150,
-												StartPos:  3059,
-												EndPos:    3065,
-											},
-										},
-										Value: []byte("public"),
-									},
-									Alias: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 150,
-												EndLine:   150,
-												StartPos:  3066,
-												EndPos:    3069,
-											},
-										},
-										Value: []byte("two"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 151,
-						EndLine:   151,
-						StartPos:  3075,
-						EndPos:    3152,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 151,
-							EndLine:   151,
-							StartPos:  3081,
-							EndPos:    3084,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 151,
-								EndLine:   151,
-								StartPos:  3087,
-								EndPos:    3150,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 151,
-										EndLine:   151,
-										StartPos:  3091,
-										EndPos:    3094,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 151,
-												EndLine:   151,
-												StartPos:  3091,
-												EndPos:    3094,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 151,
-										EndLine:   151,
-										StartPos:  3096,
-										EndPos:    3099,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 151,
-												EndLine:   151,
-												StartPos:  3096,
-												EndPos:    3099,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 151,
-									EndLine:   151,
-									StartPos:  3100,
-									EndPos:    3150,
-								},
-							},
-							Adaptations: []ast.Vertex{
-								&ast.StmtTraitUsePrecedence{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 151,
-											EndLine:   151,
-											StartPos:  3102,
-											EndPos:    3130,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 151,
-												EndLine:   151,
-												StartPos:  3102,
-												EndPos:    3110,
-											},
-										},
-										Trait: &ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 151,
-													EndLine:   151,
-													StartPos:  3102,
-													EndPos:    3105,
-												},
-											},
-											Parts: []ast.Vertex{
-												&ast.NameNamePart{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 151,
-															EndLine:   151,
-															StartPos:  3102,
-															EndPos:    3105,
-														},
-													},
-													Value: []byte("Bar"),
-												},
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 151,
-													EndLine:   151,
-													StartPos:  3107,
-													EndPos:    3110,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Insteadof: []ast.Vertex{
-										&ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 151,
-													EndLine:   151,
-													StartPos:  3121,
-													EndPos:    3124,
-												},
-											},
-											Parts: []ast.Vertex{
-												&ast.NameNamePart{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 151,
-															EndLine:   151,
-															StartPos:  3121,
-															EndPos:    3124,
-														},
-													},
-													Value: []byte("Baz"),
-												},
-											},
-										},
-										&ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 151,
-													EndLine:   151,
-													StartPos:  3126,
-													EndPos:    3130,
-												},
-											},
-											Parts: []ast.Vertex{
-												&ast.NameNamePart{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 151,
-															EndLine:   151,
-															StartPos:  3126,
-															EndPos:    3130,
-														},
-													},
-													Value: []byte("Quux"),
-												},
-											},
-										},
-									},
-								},
-								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 151,
-											EndLine:   151,
-											StartPos:  3132,
-											EndPos:    3147,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 151,
-												EndLine:   151,
-												StartPos:  3132,
-												EndPos:    3140,
-											},
-										},
-										Trait: &ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 151,
-													EndLine:   151,
-													StartPos:  3132,
-													EndPos:    3135,
-												},
-											},
-											Parts: []ast.Vertex{
-												&ast.NameNamePart{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 151,
-															EndLine:   151,
-															StartPos:  3132,
-															EndPos:    3135,
-														},
-													},
-													Value: []byte("Baz"),
-												},
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 151,
-													EndLine:   151,
-													StartPos:  3137,
-													EndPos:    3140,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Alias: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 151,
-												EndLine:   151,
-												StartPos:  3144,
-												EndPos:    3147,
-											},
-										},
-										Value: []byte("two"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 153,
-						EndLine:   -1,
-						StartPos:  3154,
-						EndPos:    -1,
-					},
-				},
-				Stmts:   []ast.Vertex{},
-				Catches: []ast.Vertex{},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 154,
-						EndLine:   154,
-						StartPos:  3161,
-						EndPos:    3191,
-					},
-				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 154,
-								EndLine:   154,
-								StartPos:  3168,
-								EndPos:    3191,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 154,
-										EndLine:   154,
-										StartPos:  3175,
-										EndPos:    3184,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 154,
-												EndLine:   154,
-												StartPos:  3175,
-												EndPos:    3184,
-											},
-										},
-										Value: []byte("Exception"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 154,
-									EndLine:   154,
-									StartPos:  3185,
-									EndPos:    3187,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 154,
-										EndLine:   154,
-										StartPos:  3185,
-										EndPos:    3187,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 155,
-						EndLine:   155,
-						StartPos:  3192,
-						EndPos:    3239,
-					},
-				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 155,
-								EndLine:   155,
-								StartPos:  3199,
-								EndPos:    3239,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 155,
-										EndLine:   155,
-										StartPos:  3206,
-										EndPos:    3215,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 155,
-												EndLine:   155,
-												StartPos:  3206,
-												EndPos:    3215,
-											},
-										},
-										Value: []byte("Exception"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 155,
-										EndLine:   155,
-										StartPos:  3216,
-										EndPos:    3232,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 155,
-												EndLine:   155,
-												StartPos:  3216,
-												EndPos:    3232,
-											},
-										},
-										Value: []byte("RuntimeException"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 155,
-									EndLine:   155,
-									StartPos:  3233,
-									EndPos:    3235,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 155,
-										EndLine:   155,
-										StartPos:  3233,
-										EndPos:    3235,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 156,
-						EndLine:   156,
-						StartPos:  3240,
-						EndPos:    3301,
-					},
-				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 156,
-								EndLine:   156,
-								StartPos:  3247,
-								EndPos:    3270,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 156,
-										EndLine:   156,
-										StartPos:  3254,
-										EndPos:    3263,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 156,
-												EndLine:   156,
-												StartPos:  3254,
-												EndPos:    3263,
-											},
-										},
-										Value: []byte("Exception"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 156,
-									EndLine:   156,
-									StartPos:  3264,
-									EndPos:    3266,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 156,
-										EndLine:   156,
-										StartPos:  3264,
-										EndPos:    3266,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 156,
-								EndLine:   156,
-								StartPos:  3271,
-								EndPos:    3301,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 156,
-										EndLine:   156,
-										StartPos:  3278,
-										EndPos:    3294,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 156,
-												EndLine:   156,
-												StartPos:  3278,
-												EndPos:    3294,
-											},
-										},
-										Value: []byte("RuntimeException"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 156,
-									EndLine:   156,
-									StartPos:  3295,
-									EndPos:    3297,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 156,
-										EndLine:   156,
-										StartPos:  3295,
-										EndPos:    3297,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 157,
-						EndLine:   157,
-						StartPos:  3302,
-						EndPos:    3343,
-					},
-				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 157,
-								EndLine:   157,
-								StartPos:  3309,
-								EndPos:    3332,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 157,
-										EndLine:   157,
-										StartPos:  3316,
-										EndPos:    3325,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 157,
-												EndLine:   157,
-												StartPos:  3316,
-												EndPos:    3325,
-											},
-										},
-										Value: []byte("Exception"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 157,
-									EndLine:   157,
-									StartPos:  3326,
-									EndPos:    3328,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 157,
-										EndLine:   157,
-										StartPos:  3326,
-										EndPos:    3328,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-				Finally: &ast.StmtFinally{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 157,
-							EndLine:   157,
-							StartPos:  3333,
-							EndPos:    3343,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtUnset{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 159,
-						EndLine:   159,
-						StartPos:  3345,
-						EndPos:    3360,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 159,
-								EndLine:   159,
-								StartPos:  3351,
-								EndPos:    3353,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 159,
-									EndLine:   159,
-									StartPos:  3351,
-									EndPos:    3353,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 159,
-								EndLine:   159,
-								StartPos:  3355,
-								EndPos:    3357,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 159,
-									EndLine:   159,
-									StartPos:  3355,
-									EndPos:    3357,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 161,
-						EndLine:   161,
-						StartPos:  3362,
-						EndPos:    3370,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 161,
-								EndLine:   161,
-								StartPos:  3366,
-								EndPos:    3369,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 161,
-									EndLine:   161,
-									StartPos:  3366,
-									EndPos:    3369,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 161,
-											EndLine:   161,
-											StartPos:  3366,
-											EndPos:    3369,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 162,
-						EndLine:   162,
-						StartPos:  3371,
-						EndPos:    3380,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 162,
-								EndLine:   162,
-								StartPos:  3375,
-								EndPos:    3379,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3376,
-									EndPos:    3379,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 162,
-											EndLine:   162,
-											StartPos:  3376,
-											EndPos:    3379,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 163,
-						EndLine:   163,
-						StartPos:  3381,
-						EndPos:    3397,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 163,
-								EndLine:   163,
-								StartPos:  3385,
-								EndPos:    3396,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 163,
-									EndLine:   163,
-									StartPos:  3386,
-									EndPos:    3389,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 163,
-											EndLine:   163,
-											StartPos:  3386,
-											EndPos:    3389,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 163,
-									EndLine:   163,
-									StartPos:  3393,
-									EndPos:    3396,
-								},
-							},
-							Value: []byte("Bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 164,
-						EndLine:   164,
-						StartPos:  3398,
-						EndPos:    3411,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 164,
-								EndLine:   164,
-								StartPos:  3402,
-								EndPos:    3405,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 164,
-									EndLine:   164,
-									StartPos:  3402,
-									EndPos:    3405,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 164,
-											EndLine:   164,
-											StartPos:  3402,
-											EndPos:    3405,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 164,
-								EndLine:   164,
-								StartPos:  3407,
-								EndPos:    3410,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 164,
-									EndLine:   164,
-									StartPos:  3407,
-									EndPos:    3410,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 164,
-											EndLine:   164,
-											StartPos:  3407,
-											EndPos:    3410,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 165,
-						EndLine:   165,
-						StartPos:  3412,
-						EndPos:    3432,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 165,
-								EndLine:   165,
-								StartPos:  3416,
-								EndPos:    3419,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 165,
-									EndLine:   165,
-									StartPos:  3416,
-									EndPos:    3419,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 165,
-											EndLine:   165,
-											StartPos:  3416,
-											EndPos:    3419,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 165,
-								EndLine:   165,
-								StartPos:  3421,
-								EndPos:    3431,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 165,
-									EndLine:   165,
-									StartPos:  3421,
-									EndPos:    3424,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 165,
-											EndLine:   165,
-											StartPos:  3421,
-											EndPos:    3424,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 165,
-									EndLine:   165,
-									StartPos:  3428,
-									EndPos:    3431,
-								},
-							},
-							Value: []byte("Baz"),
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 166,
-						EndLine:   166,
-						StartPos:  3433,
-						EndPos:    3456,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 166,
-							EndLine:   166,
-							StartPos:  3437,
-							EndPos:    3445,
-						},
-					},
-					Value: []byte("function"),
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 166,
-								EndLine:   166,
-								StartPos:  3446,
-								EndPos:    3449,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 166,
-									EndLine:   166,
-									StartPos:  3446,
-									EndPos:    3449,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 166,
-											EndLine:   166,
-											StartPos:  3446,
-											EndPos:    3449,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 166,
-								EndLine:   166,
-								StartPos:  3451,
-								EndPos:    3455,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 166,
-									EndLine:   166,
-									StartPos:  3452,
-									EndPos:    3455,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 166,
-											EndLine:   166,
-											StartPos:  3452,
-											EndPos:    3455,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 167,
-						EndLine:   167,
-						StartPos:  3457,
-						EndPos:    3494,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 167,
-							EndLine:   167,
-							StartPos:  3461,
-							EndPos:    3469,
-						},
-					},
-					Value: []byte("function"),
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 167,
-								EndLine:   167,
-								StartPos:  3470,
-								EndPos:    3480,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3470,
-									EndPos:    3473,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 167,
-											EndLine:   167,
-											StartPos:  3470,
-											EndPos:    3473,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3477,
-									EndPos:    3480,
-								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 167,
-								EndLine:   167,
-								StartPos:  3482,
-								EndPos:    3493,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3483,
-									EndPos:    3486,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 167,
-											EndLine:   167,
-											StartPos:  3483,
-											EndPos:    3486,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3490,
-									EndPos:    3493,
-								},
-							},
-							Value: []byte("bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 168,
-						EndLine:   168,
-						StartPos:  3495,
-						EndPos:    3515,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 168,
-							EndLine:   168,
-							StartPos:  3499,
-							EndPos:    3504,
-						},
-					},
-					Value: []byte("const"),
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 168,
-								EndLine:   168,
-								StartPos:  3505,
-								EndPos:    3508,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 168,
-									EndLine:   168,
-									StartPos:  3505,
-									EndPos:    3508,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 168,
-											EndLine:   168,
-											StartPos:  3505,
-											EndPos:    3508,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 168,
-								EndLine:   168,
-								StartPos:  3510,
-								EndPos:    3514,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 168,
-									EndLine:   168,
-									StartPos:  3511,
-									EndPos:    3514,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 168,
-											EndLine:   168,
-											StartPos:  3511,
-											EndPos:    3514,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 169,
-						EndLine:   169,
-						StartPos:  3516,
-						EndPos:    3550,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 169,
-							EndLine:   169,
-							StartPos:  3520,
-							EndPos:    3525,
-						},
-					},
-					Value: []byte("const"),
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 169,
-								EndLine:   169,
-								StartPos:  3526,
-								EndPos:    3536,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3526,
-									EndPos:    3529,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 169,
-											EndLine:   169,
-											StartPos:  3526,
-											EndPos:    3529,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3533,
-									EndPos:    3536,
-								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 169,
-								EndLine:   169,
-								StartPos:  3538,
-								EndPos:    3549,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3539,
-									EndPos:    3542,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 169,
-											EndLine:   169,
-											StartPos:  3539,
-											EndPos:    3542,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3546,
-									EndPos:    3549,
-								},
-							},
-							Value: []byte("bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtGroupUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 171,
-						EndLine:   171,
-						StartPos:  3552,
-						EndPos:    3572,
-					},
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 171,
-							EndLine:   171,
-							StartPos:  3557,
-							EndPos:    3560,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 171,
-									EndLine:   171,
-									StartPos:  3557,
-									EndPos:    3560,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 171,
-								EndLine:   171,
-								StartPos:  3562,
-								EndPos:    3565,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 171,
-									EndLine:   171,
-									StartPos:  3562,
-									EndPos:    3565,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 171,
-											EndLine:   171,
-											StartPos:  3562,
-											EndPos:    3565,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 171,
-								EndLine:   171,
-								StartPos:  3567,
-								EndPos:    3570,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 171,
-									EndLine:   171,
-									StartPos:  3567,
-									EndPos:    3570,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 171,
-											EndLine:   171,
-											StartPos:  3567,
-											EndPos:    3570,
-										},
-									},
-									Value: []byte("Baz"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtGroupUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 172,
-						EndLine:   172,
-						StartPos:  3573,
-						EndPos:    3600,
-					},
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 172,
-							EndLine:   172,
-							StartPos:  3577,
-							EndPos:    3580,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3577,
-									EndPos:    3580,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 172,
-								EndLine:   172,
-								StartPos:  3582,
-								EndPos:    3585,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3582,
-									EndPos:    3585,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 172,
-											EndLine:   172,
-											StartPos:  3582,
-											EndPos:    3585,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 172,
-								EndLine:   172,
-								StartPos:  3587,
-								EndPos:    3598,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3587,
-									EndPos:    3590,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 172,
-											EndLine:   172,
-											StartPos:  3587,
-											EndPos:    3590,
-										},
-									},
-									Value: []byte("Baz"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3594,
-									EndPos:    3598,
-								},
-							},
-							Value: []byte("quux"),
-						},
-					},
-				},
-			},
-			&ast.StmtGroupUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 173,
-						EndLine:   173,
-						StartPos:  3601,
-						EndPos:    3629,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 173,
-							EndLine:   173,
-							StartPos:  3605,
-							EndPos:    3613,
-						},
-					},
-					Value: []byte("function"),
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 173,
-							EndLine:   173,
-							StartPos:  3614,
-							EndPos:    3617,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 173,
-									EndLine:   173,
-									StartPos:  3614,
-									EndPos:    3617,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 173,
-								EndLine:   173,
-								StartPos:  3619,
-								EndPos:    3622,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 173,
-									EndLine:   173,
-									StartPos:  3619,
-									EndPos:    3622,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 173,
-											EndLine:   173,
-											StartPos:  3619,
-											EndPos:    3622,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 173,
-								EndLine:   173,
-								StartPos:  3624,
-								EndPos:    3627,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 173,
-									EndLine:   173,
-									StartPos:  3624,
-									EndPos:    3627,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 173,
-											EndLine:   173,
-											StartPos:  3624,
-											EndPos:    3627,
-										},
-									},
-									Value: []byte("Baz"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtGroupUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 174,
-						EndLine:   174,
-						StartPos:  3630,
-						EndPos:    3656,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 174,
-							EndLine:   174,
-							StartPos:  3634,
-							EndPos:    3639,
-						},
-					},
-					Value: []byte("const"),
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 174,
-							EndLine:   174,
-							StartPos:  3641,
-							EndPos:    3644,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 174,
-									EndLine:   174,
-									StartPos:  3641,
-									EndPos:    3644,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 174,
-								EndLine:   174,
-								StartPos:  3646,
-								EndPos:    3649,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 174,
-									EndLine:   174,
-									StartPos:  3646,
-									EndPos:    3649,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 174,
-											EndLine:   174,
-											StartPos:  3646,
-											EndPos:    3649,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 174,
-								EndLine:   174,
-								StartPos:  3651,
-								EndPos:    3654,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 174,
-									EndLine:   174,
-									StartPos:  3651,
-									EndPos:    3654,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 174,
-											EndLine:   174,
-											StartPos:  3651,
-											EndPos:    3654,
-										},
-									},
-									Value: []byte("Baz"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtGroupUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 175,
-						EndLine:   175,
-						StartPos:  3657,
-						EndPos:    3691,
-					},
-				},
-				Prefix: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 175,
-							EndLine:   175,
-							StartPos:  3661,
-							EndPos:    3664,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3661,
-									EndPos:    3664,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 175,
-								EndLine:   175,
-								StartPos:  3666,
-								EndPos:    3675,
-							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3666,
-									EndPos:    3671,
-								},
-							},
-							Value: []byte("const"),
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3672,
-									EndPos:    3675,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 175,
-											EndLine:   175,
-											StartPos:  3672,
-											EndPos:    3675,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 175,
-								EndLine:   175,
-								StartPos:  3677,
-								EndPos:    3689,
-							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3677,
-									EndPos:    3685,
-								},
-							},
-							Value: []byte("function"),
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3686,
-									EndPos:    3689,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 175,
-											EndLine:   175,
-											StartPos:  3686,
-											EndPos:    3689,
-										},
-									},
-									Value: []byte("Baz"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 177,
-						EndLine:   177,
-						StartPos:  3693,
-						EndPos:    3699,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 177,
-							EndLine:   177,
-							StartPos:  3693,
-							EndPos:    3698,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 177,
-								EndLine:   177,
-								StartPos:  3693,
-								EndPos:    3695,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 177,
-									EndLine:   177,
-									StartPos:  3693,
-									EndPos:    3695,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 177,
-								EndLine:   177,
-								StartPos:  3696,
-								EndPos:    3697,
-							},
-						},
-						Value: []byte("1"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 178,
-						EndLine:   178,
-						StartPos:  3700,
-						EndPos:    3709,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 178,
-							EndLine:   178,
-							StartPos:  3700,
-							EndPos:    3708,
-						},
-					},
-					Var: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 178,
-								EndLine:   178,
-								StartPos:  3700,
-								EndPos:    3705,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 178,
-									EndLine:   178,
-									StartPos:  3700,
-									EndPos:    3702,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 178,
-										EndLine:   178,
-										StartPos:  3700,
-										EndPos:    3702,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 178,
-									EndLine:   178,
-									StartPos:  3703,
-									EndPos:    3704,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 178,
-								EndLine:   178,
-								StartPos:  3706,
-								EndPos:    3707,
-							},
-						},
-						Value: []byte("2"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 179,
-						EndLine:   179,
-						StartPos:  3710,
-						EndPos:    3718,
-					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 179,
-							EndLine:   179,
-							StartPos:  3710,
-							EndPos:    3717,
-						},
-					},
-					Items: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 180,
-						EndLine:   180,
-						StartPos:  3719,
-						EndPos:    3728,
-					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 180,
-							EndLine:   180,
-							StartPos:  3719,
-							EndPos:    3727,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 180,
-									EndLine:   180,
-									StartPos:  3725,
-									EndPos:    3726,
-								},
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 180,
-										EndLine:   180,
-										StartPos:  3725,
-										EndPos:    3726,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 181,
-						EndLine:   181,
-						StartPos:  3729,
-						EndPos:    3747,
-					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 181,
-							EndLine:   181,
-							StartPos:  3729,
-							EndPos:    3746,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 181,
-									EndLine:   181,
-									StartPos:  3735,
-									EndPos:    3739,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 181,
-										EndLine:   181,
-										StartPos:  3735,
-										EndPos:    3736,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 181,
-										EndLine:   181,
-										StartPos:  3738,
-										EndPos:    3739,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 181,
-									EndLine:   181,
-									StartPos:  3741,
-									EndPos:    3744,
-								},
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 181,
-										EndLine:   181,
-										StartPos:  3741,
-										EndPos:    3744,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 181,
-											EndLine:   181,
-											StartPos:  3742,
-											EndPos:    3744,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 181,
-												EndLine:   181,
-												StartPos:  3742,
-												EndPos:    3744,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-						&ast.ExprArrayItem{},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 182,
-						EndLine:   182,
-						StartPos:  3748,
-						EndPos:    3752,
-					},
-				},
-				Expr: &ast.ExprBitwiseNot{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 182,
-							EndLine:   182,
-							StartPos:  3748,
-							EndPos:    3751,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 182,
-								EndLine:   182,
-								StartPos:  3749,
-								EndPos:    3751,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 182,
-									EndLine:   182,
-									StartPos:  3749,
-									EndPos:    3751,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 183,
-						EndLine:   183,
-						StartPos:  3753,
-						EndPos:    3757,
-					},
-				},
-				Expr: &ast.ExprBooleanNot{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 183,
-							EndLine:   183,
-							StartPos:  3753,
-							EndPos:    3756,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 183,
-								EndLine:   183,
-								StartPos:  3754,
-								EndPos:    3756,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 183,
-									EndLine:   183,
-									StartPos:  3754,
-									EndPos:    3756,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 185,
-						EndLine:   185,
-						StartPos:  3759,
-						EndPos:    3768,
-					},
-				},
-				Expr: &ast.ExprClassConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 185,
-							EndLine:   185,
-							StartPos:  3759,
-							EndPos:    3767,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 185,
-								EndLine:   185,
-								StartPos:  3759,
-								EndPos:    3762,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 185,
-										EndLine:   185,
-										StartPos:  3759,
-										EndPos:    3762,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					ConstantName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 185,
-								EndLine:   185,
-								StartPos:  3764,
-								EndPos:    3767,
-							},
-						},
-						Value: []byte("Bar"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 186,
-						EndLine:   186,
-						StartPos:  3769,
-						EndPos:    3779,
-					},
-				},
-				Expr: &ast.ExprClassConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 186,
-							EndLine:   186,
-							StartPos:  3769,
-							EndPos:    3778,
-						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 186,
-								EndLine:   186,
-								StartPos:  3769,
-								EndPos:    3773,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 186,
-									EndLine:   186,
-									StartPos:  3769,
-									EndPos:    3773,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					ConstantName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 186,
-								EndLine:   186,
-								StartPos:  3775,
-								EndPos:    3778,
-							},
-						},
-						Value: []byte("Bar"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 187,
-						EndLine:   187,
-						StartPos:  3780,
-						EndPos:    3790,
-					},
-				},
-				Expr: &ast.ExprClone{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 187,
-							EndLine:   187,
-							StartPos:  3780,
-							EndPos:    3789,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 187,
-								EndLine:   187,
-								StartPos:  3786,
-								EndPos:    3788,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 187,
-									EndLine:   187,
-									StartPos:  3786,
-									EndPos:    3788,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 188,
-						EndLine:   188,
-						StartPos:  3791,
-						EndPos:    3800,
-					},
-				},
-				Expr: &ast.ExprClone{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 188,
-							EndLine:   188,
-							StartPos:  3791,
-							EndPos:    3799,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 188,
-								EndLine:   188,
-								StartPos:  3797,
-								EndPos:    3799,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 188,
-									EndLine:   188,
-									StartPos:  3797,
-									EndPos:    3799,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 189,
-						EndLine:   189,
-						StartPos:  3801,
-						EndPos:    3814,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 189,
-							EndLine:   189,
-							StartPos:  3801,
-							EndPos:    3813,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 190,
-						EndLine:   190,
-						StartPos:  3815,
-						EndPos:    3849,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 190,
-							EndLine:   190,
-							StartPos:  3815,
-							EndPos:    3848,
-						},
-					},
-					Params: []ast.Vertex{
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 190,
-									EndLine:   190,
-									StartPos:  3824,
-									EndPos:    3826,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 190,
-										EndLine:   190,
-										StartPos:  3824,
-										EndPos:    3826,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 190,
-											EndLine:   190,
-											StartPos:  3824,
-											EndPos:    3826,
-										},
-									},
-									Value: []byte("$a"),
-								},
-							},
-						},
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 190,
-									EndLine:   190,
-									StartPos:  3828,
-									EndPos:    3830,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 190,
-										EndLine:   190,
-										StartPos:  3828,
-										EndPos:    3830,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 190,
-											EndLine:   190,
-											StartPos:  3828,
-											EndPos:    3830,
-										},
-									},
-									Value: []byte("$b"),
-								},
-							},
-						},
-					},
-					ClosureUse: &ast.ExprClosureUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 190,
-								EndLine:   190,
-								StartPos:  3832,
-								EndPos:    3845,
-							},
-						},
-						Uses: []ast.Vertex{
-							&ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 190,
-										EndLine:   190,
-										StartPos:  3837,
-										EndPos:    3839,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 190,
-											EndLine:   190,
-											StartPos:  3837,
-											EndPos:    3839,
-										},
-									},
-									Value: []byte("$c"),
-								},
-							},
-							&ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 190,
-										EndLine:   190,
-										StartPos:  3841,
-										EndPos:    3844,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 190,
-											EndLine:   190,
-											StartPos:  3842,
-											EndPos:    3844,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 190,
-												EndLine:   190,
-												StartPos:  3842,
-												EndPos:    3844,
-											},
-										},
-										Value: []byte("$d"),
-									},
-								},
-							},
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 191,
-						EndLine:   191,
-						StartPos:  3850,
-						EndPos:    3870,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 191,
-							EndLine:   191,
-							StartPos:  3850,
-							EndPos:    3869,
-						},
-					},
-					ReturnType: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 191,
-								EndLine:   191,
-								StartPos:  3862,
-								EndPos:    3866,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 191,
-										EndLine:   191,
-										StartPos:  3862,
-										EndPos:    3866,
-									},
-								},
-								Value: []byte("void"),
-							},
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 192,
-						EndLine:   192,
-						StartPos:  3871,
-						EndPos:    3875,
-					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 192,
-							EndLine:   192,
-							StartPos:  3871,
-							EndPos:    3874,
-						},
-					},
-					Const: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 192,
-								EndLine:   192,
-								StartPos:  3871,
-								EndPos:    3874,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 192,
-										EndLine:   192,
-										StartPos:  3871,
-										EndPos:    3874,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 193,
-						EndLine:   193,
-						StartPos:  3876,
-						EndPos:    3890,
-					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 193,
-							EndLine:   193,
-							StartPos:  3876,
-							EndPos:    3889,
-						},
-					},
-					Const: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 193,
-								EndLine:   193,
-								StartPos:  3876,
-								EndPos:    3889,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 193,
-										EndLine:   193,
-										StartPos:  3886,
-										EndPos:    3889,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 194,
-						EndLine:   194,
-						StartPos:  3891,
-						EndPos:    3896,
-					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 194,
-							EndLine:   194,
-							StartPos:  3891,
-							EndPos:    3895,
-						},
-					},
-					Const: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 194,
-								EndLine:   194,
-								StartPos:  3891,
-								EndPos:    3895,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 194,
-										EndLine:   194,
-										StartPos:  3892,
-										EndPos:    3895,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 196,
-						EndLine:   196,
-						StartPos:  3898,
-						EndPos:    3908,
-					},
-				},
-				Expr: &ast.ExprEmpty{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 196,
-							EndLine:   196,
-							StartPos:  3898,
-							EndPos:    3907,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 196,
-								EndLine:   196,
-								StartPos:  3904,
-								EndPos:    3906,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 196,
-									EndLine:   196,
-									StartPos:  3904,
-									EndPos:    3906,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 197,
-						EndLine:   197,
-						StartPos:  3909,
-						EndPos:    3913,
-					},
-				},
-				Expr: &ast.ExprErrorSuppress{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 197,
-							EndLine:   197,
-							StartPos:  3909,
-							EndPos:    3912,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 197,
-								EndLine:   197,
-								StartPos:  3910,
-								EndPos:    3912,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 197,
-									EndLine:   197,
-									StartPos:  3910,
-									EndPos:    3912,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 198,
-						EndLine:   198,
-						StartPos:  3914,
-						EndPos:    3923,
-					},
-				},
-				Expr: &ast.ExprEval{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 198,
-							EndLine:   198,
-							StartPos:  3914,
-							EndPos:    3922,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 198,
-								EndLine:   198,
-								StartPos:  3919,
-								EndPos:    3921,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 198,
-									EndLine:   198,
-									StartPos:  3919,
-									EndPos:    3921,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 199,
-						EndLine:   199,
-						StartPos:  3924,
-						EndPos:    3929,
-					},
-				},
-				Expr: &ast.ExprExit{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 199,
-							EndLine:   199,
-							StartPos:  3924,
-							EndPos:    3928,
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 200,
-						EndLine:   200,
-						StartPos:  3930,
-						EndPos:    3939,
-					},
-				},
-				Expr: &ast.ExprExit{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 200,
-							EndLine:   200,
-							StartPos:  3930,
-							EndPos:    3938,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 200,
-								EndLine:   200,
-								StartPos:  3935,
-								EndPos:    3937,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 200,
-									EndLine:   200,
-									StartPos:  3935,
-									EndPos:    3937,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 201,
-						EndLine:   201,
-						StartPos:  3940,
-						EndPos:    3944,
-					},
-				},
-				Expr: &ast.ExprExit{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 201,
-							EndLine:   201,
-							StartPos:  3940,
-							EndPos:    3943,
-						},
-					},
-					Die: true,
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 202,
-						EndLine:   202,
-						StartPos:  3945,
-						EndPos:    3953,
-					},
-				},
-				Expr: &ast.ExprExit{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 202,
-							EndLine:   202,
-							StartPos:  3945,
-							EndPos:    3952,
-						},
-					},
-					Die: true,
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 202,
-								EndLine:   202,
-								StartPos:  3949,
-								EndPos:    3951,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 202,
-									EndLine:   202,
-									StartPos:  3949,
-									EndPos:    3951,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 203,
-						EndLine:   203,
-						StartPos:  3954,
-						EndPos:    3960,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 203,
-							EndLine:   203,
-							StartPos:  3954,
-							EndPos:    3959,
-						},
-					},
-					Function: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 203,
-								EndLine:   203,
-								StartPos:  3954,
-								EndPos:    3957,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 203,
-										EndLine:   203,
-										StartPos:  3954,
-										EndPos:    3957,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 203,
-								EndLine:   203,
-								StartPos:  3957,
-								EndPos:    3959,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 204,
-						EndLine:   204,
-						StartPos:  3961,
-						EndPos:    3977,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 204,
-							EndLine:   204,
-							StartPos:  3961,
-							EndPos:    3976,
-						},
-					},
-					Function: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 204,
-								EndLine:   204,
-								StartPos:  3961,
-								EndPos:    3974,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 204,
-										EndLine:   204,
-										StartPos:  3971,
-										EndPos:    3974,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 204,
-								EndLine:   204,
-								StartPos:  3974,
-								EndPos:    3976,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 205,
-						EndLine:   205,
-						StartPos:  3978,
-						EndPos:    3985,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 205,
-							EndLine:   205,
-							StartPos:  3978,
-							EndPos:    3984,
-						},
-					},
-					Function: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 205,
-								EndLine:   205,
-								StartPos:  3978,
-								EndPos:    3982,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 205,
-										EndLine:   205,
-										StartPos:  3979,
-										EndPos:    3982,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 205,
-								EndLine:   205,
-								StartPos:  3982,
-								EndPos:    3984,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 206,
-						EndLine:   206,
-						StartPos:  3986,
-						EndPos:    3993,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 206,
-							EndLine:   206,
-							StartPos:  3986,
-							EndPos:    3992,
-						},
-					},
-					Function: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 206,
-								EndLine:   206,
-								StartPos:  3986,
-								EndPos:    3990,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 206,
-									EndLine:   206,
-									StartPos:  3986,
-									EndPos:    3990,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 206,
-								EndLine:   206,
-								StartPos:  3990,
-								EndPos:    3992,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 208,
-						EndLine:   208,
-						StartPos:  3995,
-						EndPos:    4000,
-					},
-				},
-				Expr: &ast.ExprPostDec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 208,
-							EndLine:   208,
-							StartPos:  3995,
-							EndPos:    3999,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 208,
-								EndLine:   208,
-								StartPos:  3995,
-								EndPos:    3997,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 208,
-									EndLine:   208,
-									StartPos:  3995,
-									EndPos:    3997,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 209,
-						EndLine:   209,
-						StartPos:  4001,
-						EndPos:    4006,
-					},
-				},
-				Expr: &ast.ExprPostInc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 209,
-							EndLine:   209,
-							StartPos:  4001,
-							EndPos:    4005,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 209,
-								EndLine:   209,
-								StartPos:  4001,
-								EndPos:    4003,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 209,
-									EndLine:   209,
-									StartPos:  4001,
-									EndPos:    4003,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 210,
-						EndLine:   210,
-						StartPos:  4007,
-						EndPos:    4012,
-					},
-				},
-				Expr: &ast.ExprPreDec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 210,
-							EndLine:   210,
-							StartPos:  4007,
-							EndPos:    4011,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 210,
-								EndLine:   210,
-								StartPos:  4009,
-								EndPos:    4011,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 210,
-									EndLine:   210,
-									StartPos:  4009,
-									EndPos:    4011,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 211,
-						EndLine:   211,
-						StartPos:  4013,
-						EndPos:    4018,
-					},
-				},
-				Expr: &ast.ExprPreInc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 211,
-							EndLine:   211,
-							StartPos:  4013,
-							EndPos:    4017,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 211,
-								EndLine:   211,
-								StartPos:  4015,
-								EndPos:    4017,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 211,
-									EndLine:   211,
-									StartPos:  4015,
-									EndPos:    4017,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 213,
-						EndLine:   213,
-						StartPos:  4020,
-						EndPos:    4031,
-					},
-				},
-				Expr: &ast.ExprInclude{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 213,
-							EndLine:   213,
-							StartPos:  4020,
-							EndPos:    4030,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 213,
-								EndLine:   213,
-								StartPos:  4028,
-								EndPos:    4030,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 213,
-									EndLine:   213,
-									StartPos:  4028,
-									EndPos:    4030,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 214,
-						EndLine:   214,
-						StartPos:  4032,
-						EndPos:    4048,
-					},
-				},
-				Expr: &ast.ExprIncludeOnce{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 214,
-							EndLine:   214,
-							StartPos:  4032,
-							EndPos:    4047,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 214,
-								EndLine:   214,
-								StartPos:  4045,
-								EndPos:    4047,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 214,
-									EndLine:   214,
-									StartPos:  4045,
-									EndPos:    4047,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 215,
-						EndLine:   215,
-						StartPos:  4049,
-						EndPos:    4060,
-					},
-				},
-				Expr: &ast.ExprRequire{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 215,
-							EndLine:   215,
-							StartPos:  4049,
-							EndPos:    4059,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 215,
-								EndLine:   215,
-								StartPos:  4057,
-								EndPos:    4059,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 215,
-									EndLine:   215,
-									StartPos:  4057,
-									EndPos:    4059,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 216,
-						EndLine:   216,
-						StartPos:  4061,
-						EndPos:    4077,
-					},
-				},
-				Expr: &ast.ExprRequireOnce{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 216,
-							EndLine:   216,
-							StartPos:  4061,
-							EndPos:    4076,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 216,
-								EndLine:   216,
-								StartPos:  4074,
-								EndPos:    4076,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 216,
-									EndLine:   216,
-									StartPos:  4074,
-									EndPos:    4076,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 218,
-						EndLine:   218,
-						StartPos:  4079,
-						EndPos:    4097,
-					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 218,
-							EndLine:   218,
-							StartPos:  4079,
-							EndPos:    4096,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 218,
-								EndLine:   218,
-								StartPos:  4079,
-								EndPos:    4081,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 218,
-									EndLine:   218,
-									StartPos:  4079,
-									EndPos:    4081,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 218,
-								EndLine:   218,
-								StartPos:  4093,
-								EndPos:    4096,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 218,
-										EndLine:   218,
-										StartPos:  4093,
-										EndPos:    4096,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 219,
-						EndLine:   219,
-						StartPos:  4098,
-						EndPos:    4126,
-					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 219,
-							EndLine:   219,
-							StartPos:  4098,
-							EndPos:    4125,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 219,
-								EndLine:   219,
-								StartPos:  4098,
-								EndPos:    4100,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 219,
-									EndLine:   219,
-									StartPos:  4098,
-									EndPos:    4100,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 219,
-								EndLine:   219,
-								StartPos:  4112,
-								EndPos:    4125,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 219,
-										EndLine:   219,
-										StartPos:  4122,
-										EndPos:    4125,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 220,
-						EndLine:   220,
-						StartPos:  4127,
-						EndPos:    4146,
-					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 220,
-							EndLine:   220,
-							StartPos:  4127,
-							EndPos:    4145,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 220,
-								EndLine:   220,
-								StartPos:  4127,
-								EndPos:    4129,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 220,
-									EndLine:   220,
-									StartPos:  4127,
-									EndPos:    4129,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 220,
-								EndLine:   220,
-								StartPos:  4141,
-								EndPos:    4145,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 220,
-										EndLine:   220,
-										StartPos:  4142,
-										EndPos:    4145,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 222,
-						EndLine:   222,
-						StartPos:  4148,
-						EndPos:    4162,
-					},
-				},
-				Expr: &ast.ExprIsset{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 222,
-							EndLine:   222,
-							StartPos:  4148,
-							EndPos:    4161,
-						},
-					},
-					Vars: []ast.Vertex{
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 222,
-									EndLine:   222,
-									StartPos:  4154,
-									EndPos:    4156,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 222,
-										EndLine:   222,
-										StartPos:  4154,
-										EndPos:    4156,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 222,
-									EndLine:   222,
-									StartPos:  4158,
-									EndPos:    4160,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 222,
-										EndLine:   222,
-										StartPos:  4158,
-										EndPos:    4160,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 223,
-						EndLine:   223,
-						StartPos:  4163,
-						EndPos:    4177,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 223,
-							EndLine:   223,
-							StartPos:  4163,
-							EndPos:    4176,
-						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 223,
-								EndLine:   223,
-								StartPos:  4163,
-								EndPos:    4171,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 223,
-										EndLine:   223,
-										StartPos:  4168,
-										EndPos:    4170,
-									},
-								},
-								Val: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 223,
-											EndLine:   223,
-											StartPos:  4168,
-											EndPos:    4170,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 223,
-												EndLine:   223,
-												StartPos:  4168,
-												EndPos:    4170,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 223,
-								EndLine:   223,
-								StartPos:  4174,
-								EndPos:    4176,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 223,
-									EndLine:   223,
-									StartPos:  4174,
-									EndPos:    4176,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 224,
-						EndLine:   224,
-						StartPos:  4178,
-						EndPos:    4194,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 224,
-							EndLine:   224,
-							StartPos:  4178,
-							EndPos:    4193,
-						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 224,
-								EndLine:   224,
-								StartPos:  4178,
-								EndPos:    4188,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 224,
-										EndLine:   224,
-										StartPos:  4183,
-										EndPos:    4187,
-									},
-								},
-								Val: &ast.ExprArrayDimFetch{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 224,
-											EndLine:   224,
-											StartPos:  4183,
-											EndPos:    4187,
-										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 224,
-												EndLine:   224,
-												StartPos:  4183,
-												EndPos:    4185,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 224,
-													EndLine:   224,
-													StartPos:  4183,
-													EndPos:    4185,
-												},
-											},
-											Value: []byte("$a"),
-										},
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 224,
-								EndLine:   224,
-								StartPos:  4191,
-								EndPos:    4193,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 224,
-									EndLine:   224,
-									StartPos:  4191,
-									EndPos:    4193,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 225,
-						EndLine:   225,
-						StartPos:  4195,
-						EndPos:    4215,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 225,
-							EndLine:   225,
-							StartPos:  4195,
-							EndPos:    4214,
-						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 225,
-								EndLine:   225,
-								StartPos:  4195,
-								EndPos:    4209,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 225,
-										EndLine:   225,
-										StartPos:  4200,
-										EndPos:    4208,
-									},
-								},
-								Val: &ast.ExprList{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 225,
-											EndLine:   225,
-											StartPos:  4200,
-											EndPos:    4208,
-										},
-									},
-									Items: []ast.Vertex{
-										&ast.ExprArrayItem{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 225,
-													EndLine:   225,
-													StartPos:  4205,
-													EndPos:    4207,
-												},
-											},
-											Val: &ast.ExprVariable{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 225,
-														EndLine:   225,
-														StartPos:  4205,
-														EndPos:    4207,
-													},
-												},
-												VarName: &ast.Identifier{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 225,
-															EndLine:   225,
-															StartPos:  4205,
-															EndPos:    4207,
-														},
-													},
-													Value: []byte("$a"),
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 225,
-								EndLine:   225,
-								StartPos:  4212,
-								EndPos:    4214,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 225,
-									EndLine:   225,
-									StartPos:  4212,
-									EndPos:    4214,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 227,
-						EndLine:   227,
-						StartPos:  4217,
-						EndPos:    4227,
-					},
-				},
-				Expr: &ast.ExprMethodCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 227,
-							EndLine:   227,
-							StartPos:  4217,
-							EndPos:    4226,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 227,
-								EndLine:   227,
-								StartPos:  4217,
-								EndPos:    4219,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 227,
-									EndLine:   227,
-									StartPos:  4217,
-									EndPos:    4219,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Method: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 227,
-								EndLine:   227,
-								StartPos:  4221,
-								EndPos:    4224,
-							},
-						},
-						Value: []byte("foo"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 227,
-								EndLine:   227,
-								StartPos:  4224,
-								EndPos:    4226,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 228,
-						EndLine:   228,
-						StartPos:  4228,
-						EndPos:    4238,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 228,
-							EndLine:   228,
-							StartPos:  4228,
-							EndPos:    4237,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 228,
-								EndLine:   228,
-								StartPos:  4232,
-								EndPos:    4235,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 228,
-										EndLine:   228,
-										StartPos:  4232,
-										EndPos:    4235,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 228,
-								EndLine:   228,
-								StartPos:  4235,
-								EndPos:    4237,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 229,
-						EndLine:   229,
-						StartPos:  4239,
-						EndPos:    4259,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 229,
-							EndLine:   229,
-							StartPos:  4239,
-							EndPos:    4258,
-						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 229,
-								EndLine:   229,
-								StartPos:  4243,
-								EndPos:    4256,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 229,
-										EndLine:   229,
-										StartPos:  4253,
-										EndPos:    4256,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 229,
-								EndLine:   229,
-								StartPos:  4256,
-								EndPos:    4258,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 230,
-						EndLine:   230,
-						StartPos:  4260,
-						EndPos:    4271,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 230,
-							EndLine:   230,
-							StartPos:  4260,
-							EndPos:    4270,
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 230,
-								EndLine:   230,
-								StartPos:  4264,
-								EndPos:    4268,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 230,
-										EndLine:   230,
-										StartPos:  4265,
-										EndPos:    4268,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 230,
-								EndLine:   230,
-								StartPos:  4268,
-								EndPos:    4270,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 231,
-						EndLine:   231,
-						StartPos:  4272,
-						EndPos:    4297,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 231,
-							EndLine:   231,
-							StartPos:  4272,
-							EndPos:    4296,
-						},
-					},
-					Class: &ast.StmtClass{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 231,
-								EndLine:   231,
-								StartPos:  4276,
-								EndPos:    4296,
-							},
-						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 231,
-									EndLine:   231,
-									StartPos:  4282,
-									EndPos:    4293,
-								},
-							},
-							Arguments: []ast.Vertex{
-								&ast.Argument{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 231,
-											EndLine:   231,
-											StartPos:  4283,
-											EndPos:    4285,
-										},
-									},
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 231,
-												EndLine:   231,
-												StartPos:  4283,
-												EndPos:    4285,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 231,
-													EndLine:   231,
-													StartPos:  4283,
-													EndPos:    4285,
-												},
-											},
-											Value: []byte("$a"),
-										},
-									},
-								},
-								&ast.Argument{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 231,
-											EndLine:   231,
-											StartPos:  4287,
-											EndPos:    4292,
-										},
-									},
-									Variadic: true,
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 231,
-												EndLine:   231,
-												StartPos:  4290,
-												EndPos:    4292,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 231,
-													EndLine:   231,
-													StartPos:  4290,
-													EndPos:    4292,
-												},
-											},
-											Value: []byte("$b"),
-										},
-									},
-								},
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 232,
-						EndLine:   232,
-						StartPos:  4298,
-						EndPos:    4308,
-					},
-				},
-				Expr: &ast.ExprPrint{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 232,
-							EndLine:   232,
-							StartPos:  4298,
-							EndPos:    4307,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 232,
-								EndLine:   232,
-								StartPos:  4304,
-								EndPos:    4306,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 232,
-									EndLine:   232,
-									StartPos:  4304,
-									EndPos:    4306,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 233,
-						EndLine:   233,
-						StartPos:  4309,
-						EndPos:    4317,
-					},
-				},
-				Expr: &ast.ExprPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 233,
-							EndLine:   233,
-							StartPos:  4309,
-							EndPos:    4316,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 233,
-								EndLine:   233,
-								StartPos:  4309,
-								EndPos:    4311,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 233,
-									EndLine:   233,
-									StartPos:  4309,
-									EndPos:    4311,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Property: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 233,
-								EndLine:   233,
-								StartPos:  4313,
-								EndPos:    4316,
-							},
-						},
-						Value: []byte("foo"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 234,
-						EndLine:   234,
-						StartPos:  4318,
-						EndPos:    4327,
-					},
-				},
-				Expr: &ast.ExprShellExec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 234,
-							EndLine:   234,
-							StartPos:  4318,
-							EndPos:    4326,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 234,
-									EndLine:   234,
-									StartPos:  4319,
-									EndPos:    4323,
-								},
-							},
-							Value: []byte("cmd "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 234,
-									EndLine:   234,
-									StartPos:  4323,
-									EndPos:    4325,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 234,
-										EndLine:   234,
-										StartPos:  4323,
-										EndPos:    4325,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 235,
-						EndLine:   235,
-						StartPos:  4328,
-						EndPos:    4334,
-					},
-				},
-				Expr: &ast.ExprShellExec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 235,
-							EndLine:   235,
-							StartPos:  4328,
-							EndPos:    4333,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 235,
-									EndLine:   235,
-									StartPos:  4329,
-									EndPos:    4332,
-								},
-							},
-							Value: []byte("cmd"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 236,
-						EndLine:   236,
-						StartPos:  4335,
-						EndPos:    4338,
-					},
-				},
-				Expr: &ast.ExprShellExec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 236,
-							EndLine:   236,
-							StartPos:  4335,
-							EndPos:    4337,
-						},
-					},
-					Parts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 237,
-						EndLine:   237,
-						StartPos:  4339,
-						EndPos:    4342,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 237,
-							EndLine:   237,
-							StartPos:  4339,
-							EndPos:    4341,
-						},
-					},
-					Items: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 238,
-						EndLine:   238,
-						StartPos:  4343,
-						EndPos:    4347,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 238,
-							EndLine:   238,
-							StartPos:  4343,
-							EndPos:    4346,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 238,
-									EndLine:   238,
-									StartPos:  4344,
-									EndPos:    4345,
-								},
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 238,
-										EndLine:   238,
-										StartPos:  4344,
-										EndPos:    4345,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 239,
-						EndLine:   239,
-						StartPos:  4348,
-						EndPos:    4361,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 239,
-							EndLine:   239,
-							StartPos:  4348,
-							EndPos:    4360,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 239,
-									EndLine:   239,
-									StartPos:  4349,
-									EndPos:    4353,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 239,
-										EndLine:   239,
-										StartPos:  4349,
-										EndPos:    4350,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 239,
-										EndLine:   239,
-										StartPos:  4352,
-										EndPos:    4353,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 239,
-									EndLine:   239,
-									StartPos:  4355,
-									EndPos:    4358,
-								},
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 239,
-										EndLine:   239,
-										StartPos:  4355,
-										EndPos:    4358,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 239,
-											EndLine:   239,
-											StartPos:  4356,
-											EndPos:    4358,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 239,
-												EndLine:   239,
-												StartPos:  4356,
-												EndPos:    4358,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-						&ast.ExprArrayItem{},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 241,
-						EndLine:   241,
-						StartPos:  4363,
-						EndPos:    4373,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 241,
-							EndLine:   241,
-							StartPos:  4363,
-							EndPos:    4372,
-						},
-					},
-					Var: &ast.ExprShortList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 241,
-								EndLine:   241,
-								StartPos:  4363,
-								EndPos:    4367,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 241,
-										EndLine:   241,
-										StartPos:  4364,
-										EndPos:    4366,
-									},
-								},
-								Val: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 241,
-											EndLine:   241,
-											StartPos:  4364,
-											EndPos:    4366,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 241,
-												EndLine:   241,
-												StartPos:  4364,
-												EndPos:    4366,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 241,
-								EndLine:   241,
-								StartPos:  4370,
-								EndPos:    4372,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 241,
-									EndLine:   241,
-									StartPos:  4370,
-									EndPos:    4372,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 242,
-						EndLine:   242,
-						StartPos:  4374,
-						EndPos:    4386,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 242,
-							EndLine:   242,
-							StartPos:  4374,
-							EndPos:    4385,
-						},
-					},
-					Var: &ast.ExprShortList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 242,
-								EndLine:   242,
-								StartPos:  4374,
-								EndPos:    4380,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 242,
-										EndLine:   242,
-										StartPos:  4375,
-										EndPos:    4379,
-									},
-								},
-								Val: &ast.ExprArrayDimFetch{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 242,
-											EndLine:   242,
-											StartPos:  4375,
-											EndPos:    4379,
-										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 242,
-												EndLine:   242,
-												StartPos:  4375,
-												EndPos:    4377,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 242,
-													EndLine:   242,
-													StartPos:  4375,
-													EndPos:    4377,
-												},
-											},
-											Value: []byte("$a"),
-										},
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 242,
-								EndLine:   242,
-								StartPos:  4383,
-								EndPos:    4385,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 242,
-									EndLine:   242,
-									StartPos:  4383,
-									EndPos:    4385,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 243,
-						EndLine:   243,
-						StartPos:  4387,
-						EndPos:    4403,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 243,
-							EndLine:   243,
-							StartPos:  4387,
-							EndPos:    4402,
-						},
-					},
-					Var: &ast.ExprShortList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 243,
-								EndLine:   243,
-								StartPos:  4387,
-								EndPos:    4397,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 243,
-										EndLine:   243,
-										StartPos:  4388,
-										EndPos:    4396,
-									},
-								},
-								Val: &ast.ExprList{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 243,
-											EndLine:   243,
-											StartPos:  4388,
-											EndPos:    4396,
-										},
-									},
-									Items: []ast.Vertex{
-										&ast.ExprArrayItem{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 243,
-													EndLine:   243,
-													StartPos:  4393,
-													EndPos:    4395,
-												},
-											},
-											Val: &ast.ExprVariable{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 243,
-														EndLine:   243,
-														StartPos:  4393,
-														EndPos:    4395,
-													},
-												},
-												VarName: &ast.Identifier{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 243,
-															EndLine:   243,
-															StartPos:  4393,
-															EndPos:    4395,
-														},
-													},
-													Value: []byte("$a"),
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 243,
-								EndLine:   243,
-								StartPos:  4400,
-								EndPos:    4402,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 243,
-									EndLine:   243,
-									StartPos:  4400,
-									EndPos:    4402,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 244,
-						EndLine:   244,
-						StartPos:  4404,
-						EndPos:    4415,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 244,
-							EndLine:   244,
-							StartPos:  4404,
-							EndPos:    4414,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 244,
-								EndLine:   244,
-								StartPos:  4404,
-								EndPos:    4407,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 244,
-										EndLine:   244,
-										StartPos:  4404,
-										EndPos:    4407,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 244,
-								EndLine:   244,
-								StartPos:  4409,
-								EndPos:    4412,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 244,
-								EndLine:   244,
-								StartPos:  4412,
-								EndPos:    4414,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 245,
-						EndLine:   245,
-						StartPos:  4416,
-						EndPos:    4437,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 245,
-							EndLine:   245,
-							StartPos:  4416,
-							EndPos:    4436,
-						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 245,
-								EndLine:   245,
-								StartPos:  4416,
-								EndPos:    4429,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 245,
-										EndLine:   245,
-										StartPos:  4426,
-										EndPos:    4429,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 245,
-								EndLine:   245,
-								StartPos:  4431,
-								EndPos:    4434,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 245,
-								EndLine:   245,
-								StartPos:  4434,
-								EndPos:    4436,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 246,
-						EndLine:   246,
-						StartPos:  4438,
-						EndPos:    4450,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 246,
-							EndLine:   246,
-							StartPos:  4438,
-							EndPos:    4449,
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 246,
-								EndLine:   246,
-								StartPos:  4438,
-								EndPos:    4442,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 246,
-										EndLine:   246,
-										StartPos:  4439,
-										EndPos:    4442,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 246,
-								EndLine:   246,
-								StartPos:  4444,
-								EndPos:    4447,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 246,
-								EndLine:   246,
-								StartPos:  4447,
-								EndPos:    4449,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 247,
-						EndLine:   247,
-						StartPos:  4451,
-						EndPos:    4461,
-					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 247,
-							EndLine:   247,
-							StartPos:  4451,
-							EndPos:    4460,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 247,
-								EndLine:   247,
-								StartPos:  4451,
-								EndPos:    4454,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 247,
-										EndLine:   247,
-										StartPos:  4451,
-										EndPos:    4454,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 247,
-								EndLine:   247,
-								StartPos:  4456,
-								EndPos:    4460,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 247,
-									EndLine:   247,
-									StartPos:  4456,
-									EndPos:    4460,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 248,
-						EndLine:   248,
-						StartPos:  4462,
-						EndPos:    4473,
-					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 248,
-							EndLine:   248,
-							StartPos:  4462,
-							EndPos:    4472,
-						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 248,
-								EndLine:   248,
-								StartPos:  4462,
-								EndPos:    4466,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 248,
-									EndLine:   248,
-									StartPos:  4462,
-									EndPos:    4466,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 248,
-								EndLine:   248,
-								StartPos:  4468,
-								EndPos:    4472,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 248,
-									EndLine:   248,
-									StartPos:  4468,
-									EndPos:    4472,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 249,
-						EndLine:   249,
-						StartPos:  4474,
-						EndPos:    4494,
-					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 249,
-							EndLine:   249,
-							StartPos:  4474,
-							EndPos:    4493,
-						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 249,
-								EndLine:   249,
-								StartPos:  4474,
-								EndPos:    4487,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 249,
-										EndLine:   249,
-										StartPos:  4484,
-										EndPos:    4487,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 249,
-								EndLine:   249,
-								StartPos:  4489,
-								EndPos:    4493,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 249,
-									EndLine:   249,
-									StartPos:  4489,
-									EndPos:    4493,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 250,
-						EndLine:   250,
-						StartPos:  4495,
-						EndPos:    4506,
-					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 250,
-							EndLine:   250,
-							StartPos:  4495,
-							EndPos:    4505,
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 250,
-								EndLine:   250,
-								StartPos:  4495,
-								EndPos:    4499,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 250,
-										EndLine:   250,
-										StartPos:  4496,
-										EndPos:    4499,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 250,
-								EndLine:   250,
-								StartPos:  4501,
-								EndPos:    4505,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 250,
-									EndLine:   250,
-									StartPos:  4501,
-									EndPos:    4505,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 251,
-						EndLine:   251,
-						StartPos:  4507,
-						EndPos:    4520,
-					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 251,
-							EndLine:   251,
-							StartPos:  4507,
-							EndPos:    4519,
-						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 251,
-								EndLine:   251,
-								StartPos:  4507,
-								EndPos:    4509,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 251,
-									EndLine:   251,
-									StartPos:  4507,
-									EndPos:    4509,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					IfTrue: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 251,
-								EndLine:   251,
-								StartPos:  4512,
-								EndPos:    4514,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 251,
-									EndLine:   251,
-									StartPos:  4512,
-									EndPos:    4514,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 251,
-								EndLine:   251,
-								StartPos:  4517,
-								EndPos:    4519,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 251,
-									EndLine:   251,
-									StartPos:  4517,
-									EndPos:    4519,
-								},
-							},
-							Value: []byte("$c"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 252,
-						EndLine:   252,
-						StartPos:  4521,
-						EndPos:    4531,
-					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 252,
-							EndLine:   252,
-							StartPos:  4521,
-							EndPos:    4530,
-						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 252,
-								EndLine:   252,
-								StartPos:  4521,
-								EndPos:    4523,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 252,
-									EndLine:   252,
-									StartPos:  4521,
-									EndPos:    4523,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 252,
-								EndLine:   252,
-								StartPos:  4528,
-								EndPos:    4530,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 252,
-									EndLine:   252,
-									StartPos:  4528,
-									EndPos:    4530,
-								},
-							},
-							Value: []byte("$c"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 253,
-						EndLine:   253,
-						StartPos:  4532,
-						EndPos:    4555,
-					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 253,
-							EndLine:   253,
-							StartPos:  4532,
-							EndPos:    4554,
-						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 253,
-								EndLine:   253,
-								StartPos:  4532,
-								EndPos:    4534,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 253,
-									EndLine:   253,
-									StartPos:  4532,
-									EndPos:    4534,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					IfTrue: &ast.ExprTernary{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 253,
-								EndLine:   253,
-								StartPos:  4537,
-								EndPos:    4549,
-							},
-						},
-						Condition: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 253,
-									EndLine:   253,
-									StartPos:  4537,
-									EndPos:    4539,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 253,
-										EndLine:   253,
-										StartPos:  4537,
-										EndPos:    4539,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						IfTrue: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 253,
-									EndLine:   253,
-									StartPos:  4542,
-									EndPos:    4544,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 253,
-										EndLine:   253,
-										StartPos:  4542,
-										EndPos:    4544,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-						IfFalse: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 253,
-									EndLine:   253,
-									StartPos:  4547,
-									EndPos:    4549,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 253,
-										EndLine:   253,
-										StartPos:  4547,
-										EndPos:    4549,
-									},
-								},
-								Value: []byte("$d"),
-							},
-						},
-					},
-					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 253,
-								EndLine:   253,
-								StartPos:  4552,
-								EndPos:    4554,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 253,
-									EndLine:   253,
-									StartPos:  4552,
-									EndPos:    4554,
-								},
-							},
-							Value: []byte("$e"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 254,
-						EndLine:   254,
-						StartPos:  4556,
-						EndPos:    4579,
-					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 254,
-							EndLine:   254,
-							StartPos:  4556,
-							EndPos:    4578,
-						},
-					},
-					Condition: &ast.ExprTernary{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 254,
-								EndLine:   254,
-								StartPos:  4556,
-								EndPos:    4568,
-							},
-						},
-						Condition: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 254,
-									EndLine:   254,
-									StartPos:  4556,
-									EndPos:    4558,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 254,
-										EndLine:   254,
-										StartPos:  4556,
-										EndPos:    4558,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						IfTrue: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 254,
-									EndLine:   254,
-									StartPos:  4561,
-									EndPos:    4563,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 254,
-										EndLine:   254,
-										StartPos:  4561,
-										EndPos:    4563,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						IfFalse: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 254,
-									EndLine:   254,
-									StartPos:  4566,
-									EndPos:    4568,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 254,
-										EndLine:   254,
-										StartPos:  4566,
-										EndPos:    4568,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-					},
-					IfTrue: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 254,
-								EndLine:   254,
-								StartPos:  4571,
-								EndPos:    4573,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 254,
-									EndLine:   254,
-									StartPos:  4571,
-									EndPos:    4573,
-								},
-							},
-							Value: []byte("$d"),
-						},
-					},
-					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 254,
-								EndLine:   254,
-								StartPos:  4576,
-								EndPos:    4578,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 254,
-									EndLine:   254,
-									StartPos:  4576,
-									EndPos:    4578,
-								},
-							},
-							Value: []byte("$e"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 255,
-						EndLine:   255,
-						StartPos:  4580,
-						EndPos:    4584,
-					},
-				},
-				Expr: &ast.ExprUnaryMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 255,
-							EndLine:   255,
-							StartPos:  4580,
-							EndPos:    4583,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 255,
-								EndLine:   255,
-								StartPos:  4581,
-								EndPos:    4583,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 255,
-									EndLine:   255,
-									StartPos:  4581,
-									EndPos:    4583,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 256,
-						EndLine:   256,
-						StartPos:  4585,
-						EndPos:    4589,
-					},
-				},
-				Expr: &ast.ExprUnaryPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 256,
-							EndLine:   256,
-							StartPos:  4585,
-							EndPos:    4588,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 256,
-								EndLine:   256,
-								StartPos:  4586,
-								EndPos:    4588,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 256,
-									EndLine:   256,
-									StartPos:  4586,
-									EndPos:    4588,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 257,
-						EndLine:   257,
-						StartPos:  4590,
-						EndPos:    4594,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 257,
-							EndLine:   257,
-							StartPos:  4590,
-							EndPos:    4593,
-						},
-					},
-					VarName: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 257,
-								EndLine:   257,
-								StartPos:  4591,
-								EndPos:    4593,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 257,
-									EndLine:   257,
-									StartPos:  4591,
-									EndPos:    4593,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 258,
-						EndLine:   258,
-						StartPos:  4595,
-						EndPos:    4601,
-					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 258,
-							EndLine:   258,
-							StartPos:  4595,
-							EndPos:    4600,
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 259,
-						EndLine:   259,
-						StartPos:  4602,
-						EndPos:    4611,
-					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 259,
-							EndLine:   259,
-							StartPos:  4602,
-							EndPos:    4610,
-						},
-					},
-					Value: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 259,
-								EndLine:   259,
-								StartPos:  4608,
-								EndPos:    4610,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 259,
-									EndLine:   259,
-									StartPos:  4608,
-									EndPos:    4610,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 260,
-						EndLine:   260,
-						StartPos:  4612,
-						EndPos:    4627,
-					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 260,
-							EndLine:   260,
-							StartPos:  4612,
-							EndPos:    4626,
-						},
-					},
-					Key: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 260,
-								EndLine:   260,
-								StartPos:  4618,
-								EndPos:    4620,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 260,
-									EndLine:   260,
-									StartPos:  4618,
-									EndPos:    4620,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Value: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 260,
-								EndLine:   260,
-								StartPos:  4624,
-								EndPos:    4626,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 260,
-									EndLine:   260,
-									StartPos:  4624,
-									EndPos:    4626,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 261,
-						EndLine:   261,
-						StartPos:  4628,
-						EndPos:    4642,
-					},
-				},
-				Expr: &ast.ExprYieldFrom{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 261,
-							EndLine:   261,
-							StartPos:  4628,
-							EndPos:    4641,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 261,
-								EndLine:   261,
-								StartPos:  4639,
-								EndPos:    4641,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 261,
-									EndLine:   261,
-									StartPos:  4639,
-									EndPos:    4641,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 263,
-						EndLine:   263,
-						StartPos:  4644,
-						EndPos:    4654,
-					},
-				},
-				Expr: &ast.ExprCastArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 263,
-							EndLine:   263,
-							StartPos:  4644,
-							EndPos:    4653,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 263,
-								EndLine:   263,
-								StartPos:  4651,
-								EndPos:    4653,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 263,
-									EndLine:   263,
-									StartPos:  4651,
-									EndPos:    4653,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 264,
-						EndLine:   264,
-						StartPos:  4655,
-						EndPos:    4667,
-					},
-				},
-				Expr: &ast.ExprCastBool{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 264,
-							EndLine:   264,
-							StartPos:  4655,
-							EndPos:    4666,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 264,
-								EndLine:   264,
-								StartPos:  4664,
-								EndPos:    4666,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 264,
-									EndLine:   264,
-									StartPos:  4664,
-									EndPos:    4666,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 265,
-						EndLine:   265,
-						StartPos:  4668,
-						EndPos:    4677,
-					},
-				},
-				Expr: &ast.ExprCastBool{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 265,
-							EndLine:   265,
-							StartPos:  4668,
-							EndPos:    4676,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 265,
-								EndLine:   265,
-								StartPos:  4674,
-								EndPos:    4676,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 265,
-									EndLine:   265,
-									StartPos:  4674,
-									EndPos:    4676,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 266,
-						EndLine:   266,
-						StartPos:  4678,
-						EndPos:    4689,
-					},
-				},
-				Expr: &ast.ExprCastDouble{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 266,
-							EndLine:   266,
-							StartPos:  4678,
-							EndPos:    4688,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 266,
-								EndLine:   266,
-								StartPos:  4686,
-								EndPos:    4688,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 266,
-									EndLine:   266,
-									StartPos:  4686,
-									EndPos:    4688,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 267,
-						EndLine:   267,
-						StartPos:  4690,
-						EndPos:    4700,
-					},
-				},
-				Expr: &ast.ExprCastDouble{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 267,
-							EndLine:   267,
-							StartPos:  4690,
-							EndPos:    4699,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 267,
-								EndLine:   267,
-								StartPos:  4697,
-								EndPos:    4699,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 267,
-									EndLine:   267,
-									StartPos:  4697,
-									EndPos:    4699,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 268,
-						EndLine:   268,
-						StartPos:  4701,
-						EndPos:    4713,
-					},
-				},
-				Expr: &ast.ExprCastInt{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 268,
-							EndLine:   268,
-							StartPos:  4701,
-							EndPos:    4712,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 268,
-								EndLine:   268,
-								StartPos:  4710,
-								EndPos:    4712,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 268,
-									EndLine:   268,
-									StartPos:  4710,
-									EndPos:    4712,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 269,
-						EndLine:   269,
-						StartPos:  4714,
-						EndPos:    4722,
-					},
-				},
-				Expr: &ast.ExprCastInt{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 269,
-							EndLine:   269,
-							StartPos:  4714,
-							EndPos:    4721,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 269,
-								EndLine:   269,
-								StartPos:  4719,
-								EndPos:    4721,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 269,
-									EndLine:   269,
-									StartPos:  4719,
-									EndPos:    4721,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 270,
-						EndLine:   270,
-						StartPos:  4723,
-						EndPos:    4734,
-					},
-				},
-				Expr: &ast.ExprCastObject{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 270,
-							EndLine:   270,
-							StartPos:  4723,
-							EndPos:    4733,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 270,
-								EndLine:   270,
-								StartPos:  4731,
-								EndPos:    4733,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 270,
-									EndLine:   270,
-									StartPos:  4731,
-									EndPos:    4733,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 271,
-						EndLine:   271,
-						StartPos:  4735,
-						EndPos:    4746,
-					},
-				},
-				Expr: &ast.ExprCastString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 271,
-							EndLine:   271,
-							StartPos:  4735,
-							EndPos:    4745,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 271,
-								EndLine:   271,
-								StartPos:  4743,
-								EndPos:    4745,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 271,
-									EndLine:   271,
-									StartPos:  4743,
-									EndPos:    4745,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 272,
-						EndLine:   272,
-						StartPos:  4747,
-						EndPos:    4757,
-					},
-				},
-				Expr: &ast.ExprCastUnset{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 272,
-							EndLine:   272,
-							StartPos:  4747,
-							EndPos:    4756,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 272,
-								EndLine:   272,
-								StartPos:  4754,
-								EndPos:    4756,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 272,
-									EndLine:   272,
-									StartPos:  4754,
-									EndPos:    4756,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 274,
-						EndLine:   274,
-						StartPos:  4759,
-						EndPos:    4767,
-					},
-				},
-				Expr: &ast.ExprBinaryBitwiseAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 274,
-							EndLine:   274,
-							StartPos:  4759,
-							EndPos:    4766,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 274,
-								EndLine:   274,
-								StartPos:  4759,
-								EndPos:    4761,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 274,
-									EndLine:   274,
-									StartPos:  4759,
-									EndPos:    4761,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 274,
-								EndLine:   274,
-								StartPos:  4764,
-								EndPos:    4766,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 274,
-									EndLine:   274,
-									StartPos:  4764,
-									EndPos:    4766,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 275,
-						EndLine:   275,
-						StartPos:  4768,
-						EndPos:    4776,
-					},
-				},
-				Expr: &ast.ExprBinaryBitwiseOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 275,
-							EndLine:   275,
-							StartPos:  4768,
-							EndPos:    4775,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 275,
-								EndLine:   275,
-								StartPos:  4768,
-								EndPos:    4770,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 275,
-									EndLine:   275,
-									StartPos:  4768,
-									EndPos:    4770,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 275,
-								EndLine:   275,
-								StartPos:  4773,
-								EndPos:    4775,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 275,
-									EndLine:   275,
-									StartPos:  4773,
-									EndPos:    4775,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 276,
-						EndLine:   276,
-						StartPos:  4777,
-						EndPos:    4785,
-					},
-				},
-				Expr: &ast.ExprBinaryBitwiseXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 276,
-							EndLine:   276,
-							StartPos:  4777,
-							EndPos:    4784,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 276,
-								EndLine:   276,
-								StartPos:  4777,
-								EndPos:    4779,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 276,
-									EndLine:   276,
-									StartPos:  4777,
-									EndPos:    4779,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 276,
-								EndLine:   276,
-								StartPos:  4782,
-								EndPos:    4784,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 276,
-									EndLine:   276,
-									StartPos:  4782,
-									EndPos:    4784,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 277,
-						EndLine:   277,
-						StartPos:  4786,
-						EndPos:    4795,
-					},
-				},
-				Expr: &ast.ExprBinaryBooleanAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 277,
-							EndLine:   277,
-							StartPos:  4786,
-							EndPos:    4794,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 277,
-								EndLine:   277,
-								StartPos:  4786,
-								EndPos:    4788,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 277,
-									EndLine:   277,
-									StartPos:  4786,
-									EndPos:    4788,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 277,
-								EndLine:   277,
-								StartPos:  4792,
-								EndPos:    4794,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 277,
-									EndLine:   277,
-									StartPos:  4792,
-									EndPos:    4794,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 278,
-						EndLine:   278,
-						StartPos:  4796,
-						EndPos:    4805,
-					},
-				},
-				Expr: &ast.ExprBinaryBooleanOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 278,
-							EndLine:   278,
-							StartPos:  4796,
-							EndPos:    4804,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 278,
-								EndLine:   278,
-								StartPos:  4796,
-								EndPos:    4798,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 278,
-									EndLine:   278,
-									StartPos:  4796,
-									EndPos:    4798,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 278,
-								EndLine:   278,
-								StartPos:  4802,
-								EndPos:    4804,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 278,
-									EndLine:   278,
-									StartPos:  4802,
-									EndPos:    4804,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 279,
-						EndLine:   279,
-						StartPos:  4806,
-						EndPos:    4815,
-					},
-				},
-				Expr: &ast.ExprBinaryCoalesce{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 279,
-							EndLine:   279,
-							StartPos:  4806,
-							EndPos:    4814,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 279,
-								EndLine:   279,
-								StartPos:  4806,
-								EndPos:    4808,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 279,
-									EndLine:   279,
-									StartPos:  4806,
-									EndPos:    4808,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 279,
-								EndLine:   279,
-								StartPos:  4812,
-								EndPos:    4814,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 279,
-									EndLine:   279,
-									StartPos:  4812,
-									EndPos:    4814,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 280,
-						EndLine:   280,
-						StartPos:  4816,
-						EndPos:    4824,
-					},
-				},
-				Expr: &ast.ExprBinaryConcat{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 280,
-							EndLine:   280,
-							StartPos:  4816,
-							EndPos:    4823,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 280,
-								EndLine:   280,
-								StartPos:  4816,
-								EndPos:    4818,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 280,
-									EndLine:   280,
-									StartPos:  4816,
-									EndPos:    4818,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 280,
-								EndLine:   280,
-								StartPos:  4821,
-								EndPos:    4823,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 280,
-									EndLine:   280,
-									StartPos:  4821,
-									EndPos:    4823,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 281,
-						EndLine:   281,
-						StartPos:  4825,
-						EndPos:    4833,
-					},
-				},
-				Expr: &ast.ExprBinaryDiv{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 281,
-							EndLine:   281,
-							StartPos:  4825,
-							EndPos:    4832,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 281,
-								EndLine:   281,
-								StartPos:  4825,
-								EndPos:    4827,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 281,
-									EndLine:   281,
-									StartPos:  4825,
-									EndPos:    4827,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 281,
-								EndLine:   281,
-								StartPos:  4830,
-								EndPos:    4832,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 281,
-									EndLine:   281,
-									StartPos:  4830,
-									EndPos:    4832,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 282,
-						EndLine:   282,
-						StartPos:  4834,
-						EndPos:    4843,
-					},
-				},
-				Expr: &ast.ExprBinaryEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 282,
-							EndLine:   282,
-							StartPos:  4834,
-							EndPos:    4842,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 282,
-								EndLine:   282,
-								StartPos:  4834,
-								EndPos:    4836,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 282,
-									EndLine:   282,
-									StartPos:  4834,
-									EndPos:    4836,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 282,
-								EndLine:   282,
-								StartPos:  4840,
-								EndPos:    4842,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 282,
-									EndLine:   282,
-									StartPos:  4840,
-									EndPos:    4842,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 283,
-						EndLine:   283,
-						StartPos:  4844,
-						EndPos:    4853,
-					},
-				},
-				Expr: &ast.ExprBinaryGreaterOrEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 283,
-							EndLine:   283,
-							StartPos:  4844,
-							EndPos:    4852,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 283,
-								EndLine:   283,
-								StartPos:  4844,
-								EndPos:    4846,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 283,
-									EndLine:   283,
-									StartPos:  4844,
-									EndPos:    4846,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 283,
-								EndLine:   283,
-								StartPos:  4850,
-								EndPos:    4852,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 283,
-									EndLine:   283,
-									StartPos:  4850,
-									EndPos:    4852,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 284,
-						EndLine:   284,
-						StartPos:  4854,
-						EndPos:    4862,
-					},
-				},
-				Expr: &ast.ExprBinaryGreater{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 284,
-							EndLine:   284,
-							StartPos:  4854,
-							EndPos:    4861,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 284,
-								EndLine:   284,
-								StartPos:  4854,
-								EndPos:    4856,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 284,
-									EndLine:   284,
-									StartPos:  4854,
-									EndPos:    4856,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 284,
-								EndLine:   284,
-								StartPos:  4859,
-								EndPos:    4861,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 284,
-									EndLine:   284,
-									StartPos:  4859,
-									EndPos:    4861,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 285,
-						EndLine:   285,
-						StartPos:  4863,
-						EndPos:    4873,
-					},
-				},
-				Expr: &ast.ExprBinaryIdentical{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 285,
-							EndLine:   285,
-							StartPos:  4863,
-							EndPos:    4872,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 285,
-								EndLine:   285,
-								StartPos:  4863,
-								EndPos:    4865,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 285,
-									EndLine:   285,
-									StartPos:  4863,
-									EndPos:    4865,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 285,
-								EndLine:   285,
-								StartPos:  4870,
-								EndPos:    4872,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 285,
-									EndLine:   285,
-									StartPos:  4870,
-									EndPos:    4872,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 286,
-						EndLine:   286,
-						StartPos:  4874,
-						EndPos:    4884,
-					},
-				},
-				Expr: &ast.ExprBinaryLogicalAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 286,
-							EndLine:   286,
-							StartPos:  4874,
-							EndPos:    4883,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 286,
-								EndLine:   286,
-								StartPos:  4874,
-								EndPos:    4876,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 286,
-									EndLine:   286,
-									StartPos:  4874,
-									EndPos:    4876,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 286,
-								EndLine:   286,
-								StartPos:  4881,
-								EndPos:    4883,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 286,
-									EndLine:   286,
-									StartPos:  4881,
-									EndPos:    4883,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 287,
-						EndLine:   287,
-						StartPos:  4885,
-						EndPos:    4894,
-					},
-				},
-				Expr: &ast.ExprBinaryLogicalOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 287,
-							EndLine:   287,
-							StartPos:  4885,
-							EndPos:    4893,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 287,
-								EndLine:   287,
-								StartPos:  4885,
-								EndPos:    4887,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 287,
-									EndLine:   287,
-									StartPos:  4885,
-									EndPos:    4887,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 287,
-								EndLine:   287,
-								StartPos:  4891,
-								EndPos:    4893,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 287,
-									EndLine:   287,
-									StartPos:  4891,
-									EndPos:    4893,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 288,
-						EndLine:   288,
-						StartPos:  4895,
-						EndPos:    4905,
-					},
-				},
-				Expr: &ast.ExprBinaryLogicalXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 288,
-							EndLine:   288,
-							StartPos:  4895,
-							EndPos:    4904,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 288,
-								EndLine:   288,
-								StartPos:  4895,
-								EndPos:    4897,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 288,
-									EndLine:   288,
-									StartPos:  4895,
-									EndPos:    4897,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 288,
-								EndLine:   288,
-								StartPos:  4902,
-								EndPos:    4904,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 288,
-									EndLine:   288,
-									StartPos:  4902,
-									EndPos:    4904,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 289,
-						EndLine:   289,
-						StartPos:  4906,
-						EndPos:    4914,
-					},
-				},
-				Expr: &ast.ExprBinaryMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 289,
-							EndLine:   289,
-							StartPos:  4906,
-							EndPos:    4913,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 289,
-								EndLine:   289,
-								StartPos:  4906,
-								EndPos:    4908,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 289,
-									EndLine:   289,
-									StartPos:  4906,
-									EndPos:    4908,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 289,
-								EndLine:   289,
-								StartPos:  4911,
-								EndPos:    4913,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 289,
-									EndLine:   289,
-									StartPos:  4911,
-									EndPos:    4913,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 290,
-						EndLine:   290,
-						StartPos:  4915,
-						EndPos:    4923,
-					},
-				},
-				Expr: &ast.ExprBinaryMod{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 290,
-							EndLine:   290,
-							StartPos:  4915,
-							EndPos:    4922,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 290,
-								EndLine:   290,
-								StartPos:  4915,
-								EndPos:    4917,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 290,
-									EndLine:   290,
-									StartPos:  4915,
-									EndPos:    4917,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 290,
-								EndLine:   290,
-								StartPos:  4920,
-								EndPos:    4922,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 290,
-									EndLine:   290,
-									StartPos:  4920,
-									EndPos:    4922,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 291,
-						EndLine:   291,
-						StartPos:  4924,
-						EndPos:    4932,
-					},
-				},
-				Expr: &ast.ExprBinaryMul{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 291,
-							EndLine:   291,
-							StartPos:  4924,
-							EndPos:    4931,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 291,
-								EndLine:   291,
-								StartPos:  4924,
-								EndPos:    4926,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 291,
-									EndLine:   291,
-									StartPos:  4924,
-									EndPos:    4926,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 291,
-								EndLine:   291,
-								StartPos:  4929,
-								EndPos:    4931,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 291,
-									EndLine:   291,
-									StartPos:  4929,
-									EndPos:    4931,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 292,
-						EndLine:   292,
-						StartPos:  4933,
-						EndPos:    4942,
-					},
-				},
-				Expr: &ast.ExprBinaryNotEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 292,
-							EndLine:   292,
-							StartPos:  4933,
-							EndPos:    4941,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 292,
-								EndLine:   292,
-								StartPos:  4933,
-								EndPos:    4935,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 292,
-									EndLine:   292,
-									StartPos:  4933,
-									EndPos:    4935,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 292,
-								EndLine:   292,
-								StartPos:  4939,
-								EndPos:    4941,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 292,
-									EndLine:   292,
-									StartPos:  4939,
-									EndPos:    4941,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 293,
-						EndLine:   293,
-						StartPos:  4943,
-						EndPos:    4953,
-					},
-				},
-				Expr: &ast.ExprBinaryNotIdentical{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 293,
-							EndLine:   293,
-							StartPos:  4943,
-							EndPos:    4952,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 293,
-								EndLine:   293,
-								StartPos:  4943,
-								EndPos:    4945,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 293,
-									EndLine:   293,
-									StartPos:  4943,
-									EndPos:    4945,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 293,
-								EndLine:   293,
-								StartPos:  4950,
-								EndPos:    4952,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 293,
-									EndLine:   293,
-									StartPos:  4950,
-									EndPos:    4952,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 294,
-						EndLine:   294,
-						StartPos:  4954,
-						EndPos:    4962,
-					},
-				},
-				Expr: &ast.ExprBinaryPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 294,
-							EndLine:   294,
-							StartPos:  4954,
-							EndPos:    4961,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 294,
-								EndLine:   294,
-								StartPos:  4954,
-								EndPos:    4956,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 294,
-									EndLine:   294,
-									StartPos:  4954,
-									EndPos:    4956,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 294,
-								EndLine:   294,
-								StartPos:  4959,
-								EndPos:    4961,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 294,
-									EndLine:   294,
-									StartPos:  4959,
-									EndPos:    4961,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 295,
-						EndLine:   295,
-						StartPos:  4963,
-						EndPos:    4972,
-					},
-				},
-				Expr: &ast.ExprBinaryPow{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 295,
-							EndLine:   295,
-							StartPos:  4963,
-							EndPos:    4971,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 295,
-								EndLine:   295,
-								StartPos:  4963,
-								EndPos:    4965,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 295,
-									EndLine:   295,
-									StartPos:  4963,
-									EndPos:    4965,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 295,
-								EndLine:   295,
-								StartPos:  4969,
-								EndPos:    4971,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 295,
-									EndLine:   295,
-									StartPos:  4969,
-									EndPos:    4971,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 296,
-						EndLine:   296,
-						StartPos:  4973,
-						EndPos:    4982,
-					},
-				},
-				Expr: &ast.ExprBinaryShiftLeft{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 296,
-							EndLine:   296,
-							StartPos:  4973,
-							EndPos:    4981,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 296,
-								EndLine:   296,
-								StartPos:  4973,
-								EndPos:    4975,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 296,
-									EndLine:   296,
-									StartPos:  4973,
-									EndPos:    4975,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 296,
-								EndLine:   296,
-								StartPos:  4979,
-								EndPos:    4981,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 296,
-									EndLine:   296,
-									StartPos:  4979,
-									EndPos:    4981,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 297,
-						EndLine:   297,
-						StartPos:  4983,
-						EndPos:    4992,
-					},
-				},
-				Expr: &ast.ExprBinaryShiftRight{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 297,
-							EndLine:   297,
-							StartPos:  4983,
-							EndPos:    4991,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 297,
-								EndLine:   297,
-								StartPos:  4983,
-								EndPos:    4985,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 297,
-									EndLine:   297,
-									StartPos:  4983,
-									EndPos:    4985,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 297,
-								EndLine:   297,
-								StartPos:  4989,
-								EndPos:    4991,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 297,
-									EndLine:   297,
-									StartPos:  4989,
-									EndPos:    4991,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 298,
-						EndLine:   298,
-						StartPos:  4993,
-						EndPos:    5002,
-					},
-				},
-				Expr: &ast.ExprBinarySmallerOrEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 298,
-							EndLine:   298,
-							StartPos:  4993,
-							EndPos:    5001,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 298,
-								EndLine:   298,
-								StartPos:  4993,
-								EndPos:    4995,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 298,
-									EndLine:   298,
-									StartPos:  4993,
-									EndPos:    4995,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 298,
-								EndLine:   298,
-								StartPos:  4999,
-								EndPos:    5001,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 298,
-									EndLine:   298,
-									StartPos:  4999,
-									EndPos:    5001,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 299,
-						EndLine:   299,
-						StartPos:  5003,
-						EndPos:    5011,
-					},
-				},
-				Expr: &ast.ExprBinarySmaller{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 299,
-							EndLine:   299,
-							StartPos:  5003,
-							EndPos:    5010,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 299,
-								EndLine:   299,
-								StartPos:  5003,
-								EndPos:    5005,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 299,
-									EndLine:   299,
-									StartPos:  5003,
-									EndPos:    5005,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 299,
-								EndLine:   299,
-								StartPos:  5008,
-								EndPos:    5010,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 299,
-									EndLine:   299,
-									StartPos:  5008,
-									EndPos:    5010,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 300,
-						EndLine:   300,
-						StartPos:  5012,
-						EndPos:    5022,
-					},
-				},
-				Expr: &ast.ExprBinarySpaceship{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 300,
-							EndLine:   300,
-							StartPos:  5012,
-							EndPos:    5021,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 300,
-								EndLine:   300,
-								StartPos:  5012,
-								EndPos:    5014,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 300,
-									EndLine:   300,
-									StartPos:  5012,
-									EndPos:    5014,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 300,
-								EndLine:   300,
-								StartPos:  5019,
-								EndPos:    5021,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 300,
-									EndLine:   300,
-									StartPos:  5019,
-									EndPos:    5021,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 302,
-						EndLine:   302,
-						StartPos:  5024,
-						EndPos:    5033,
-					},
-				},
-				Expr: &ast.ExprAssignReference{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 302,
-							EndLine:   302,
-							StartPos:  5024,
-							EndPos:    5032,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 302,
-								EndLine:   302,
-								StartPos:  5024,
-								EndPos:    5026,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 302,
-									EndLine:   302,
-									StartPos:  5024,
-									EndPos:    5026,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 302,
-								EndLine:   302,
-								StartPos:  5030,
-								EndPos:    5032,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 302,
-									EndLine:   302,
-									StartPos:  5030,
-									EndPos:    5032,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 303,
-						EndLine:   303,
-						StartPos:  5034,
-						EndPos:    5042,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 303,
-							EndLine:   303,
-							StartPos:  5034,
-							EndPos:    5041,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 303,
-								EndLine:   303,
-								StartPos:  5034,
-								EndPos:    5036,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 303,
-									EndLine:   303,
-									StartPos:  5034,
-									EndPos:    5036,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 303,
-								EndLine:   303,
-								StartPos:  5039,
-								EndPos:    5041,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 303,
-									EndLine:   303,
-									StartPos:  5039,
-									EndPos:    5041,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 304,
-						EndLine:   304,
-						StartPos:  5043,
-						EndPos:    5052,
-					},
-				},
-				Expr: &ast.ExprAssignBitwiseAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 304,
-							EndLine:   304,
-							StartPos:  5043,
-							EndPos:    5051,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 304,
-								EndLine:   304,
-								StartPos:  5043,
-								EndPos:    5045,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 304,
-									EndLine:   304,
-									StartPos:  5043,
-									EndPos:    5045,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 304,
-								EndLine:   304,
-								StartPos:  5049,
-								EndPos:    5051,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 304,
-									EndLine:   304,
-									StartPos:  5049,
-									EndPos:    5051,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 305,
-						EndLine:   305,
-						StartPos:  5053,
-						EndPos:    5062,
-					},
-				},
-				Expr: &ast.ExprAssignBitwiseOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 305,
-							EndLine:   305,
-							StartPos:  5053,
-							EndPos:    5061,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 305,
-								EndLine:   305,
-								StartPos:  5053,
-								EndPos:    5055,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 305,
-									EndLine:   305,
-									StartPos:  5053,
-									EndPos:    5055,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 305,
-								EndLine:   305,
-								StartPos:  5059,
-								EndPos:    5061,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 305,
-									EndLine:   305,
-									StartPos:  5059,
-									EndPos:    5061,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 306,
-						EndLine:   306,
-						StartPos:  5063,
-						EndPos:    5072,
-					},
-				},
-				Expr: &ast.ExprAssignBitwiseXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 306,
-							EndLine:   306,
-							StartPos:  5063,
-							EndPos:    5071,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 306,
-								EndLine:   306,
-								StartPos:  5063,
-								EndPos:    5065,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 306,
-									EndLine:   306,
-									StartPos:  5063,
-									EndPos:    5065,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 306,
-								EndLine:   306,
-								StartPos:  5069,
-								EndPos:    5071,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 306,
-									EndLine:   306,
-									StartPos:  5069,
-									EndPos:    5071,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 307,
-						EndLine:   307,
-						StartPos:  5073,
-						EndPos:    5082,
-					},
-				},
-				Expr: &ast.ExprAssignConcat{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 307,
-							EndLine:   307,
-							StartPos:  5073,
-							EndPos:    5081,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 307,
-								EndLine:   307,
-								StartPos:  5073,
-								EndPos:    5075,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 307,
-									EndLine:   307,
-									StartPos:  5073,
-									EndPos:    5075,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 307,
-								EndLine:   307,
-								StartPos:  5079,
-								EndPos:    5081,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 307,
-									EndLine:   307,
-									StartPos:  5079,
-									EndPos:    5081,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 308,
-						EndLine:   308,
-						StartPos:  5083,
-						EndPos:    5092,
-					},
-				},
-				Expr: &ast.ExprAssignDiv{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 308,
-							EndLine:   308,
-							StartPos:  5083,
-							EndPos:    5091,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 308,
-								EndLine:   308,
-								StartPos:  5083,
-								EndPos:    5085,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 308,
-									EndLine:   308,
-									StartPos:  5083,
-									EndPos:    5085,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 308,
-								EndLine:   308,
-								StartPos:  5089,
-								EndPos:    5091,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 308,
-									EndLine:   308,
-									StartPos:  5089,
-									EndPos:    5091,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 309,
-						EndLine:   309,
-						StartPos:  5093,
-						EndPos:    5102,
-					},
-				},
-				Expr: &ast.ExprAssignMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 309,
-							EndLine:   309,
-							StartPos:  5093,
-							EndPos:    5101,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 309,
-								EndLine:   309,
-								StartPos:  5093,
-								EndPos:    5095,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 309,
-									EndLine:   309,
-									StartPos:  5093,
-									EndPos:    5095,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 309,
-								EndLine:   309,
-								StartPos:  5099,
-								EndPos:    5101,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 309,
-									EndLine:   309,
-									StartPos:  5099,
-									EndPos:    5101,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 310,
-						EndLine:   310,
-						StartPos:  5103,
-						EndPos:    5112,
-					},
-				},
-				Expr: &ast.ExprAssignMod{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 310,
-							EndLine:   310,
-							StartPos:  5103,
-							EndPos:    5111,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 310,
-								EndLine:   310,
-								StartPos:  5103,
-								EndPos:    5105,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 310,
-									EndLine:   310,
-									StartPos:  5103,
-									EndPos:    5105,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 310,
-								EndLine:   310,
-								StartPos:  5109,
-								EndPos:    5111,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 310,
-									EndLine:   310,
-									StartPos:  5109,
-									EndPos:    5111,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 311,
-						EndLine:   311,
-						StartPos:  5113,
-						EndPos:    5122,
-					},
-				},
-				Expr: &ast.ExprAssignMul{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 311,
-							EndLine:   311,
-							StartPos:  5113,
-							EndPos:    5121,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 311,
-								EndLine:   311,
-								StartPos:  5113,
-								EndPos:    5115,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 311,
-									EndLine:   311,
-									StartPos:  5113,
-									EndPos:    5115,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 311,
-								EndLine:   311,
-								StartPos:  5119,
-								EndPos:    5121,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 311,
-									EndLine:   311,
-									StartPos:  5119,
-									EndPos:    5121,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 312,
-						EndLine:   312,
-						StartPos:  5123,
-						EndPos:    5132,
-					},
-				},
-				Expr: &ast.ExprAssignPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 312,
-							EndLine:   312,
-							StartPos:  5123,
-							EndPos:    5131,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 312,
-								EndLine:   312,
-								StartPos:  5123,
-								EndPos:    5125,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 312,
-									EndLine:   312,
-									StartPos:  5123,
-									EndPos:    5125,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 312,
-								EndLine:   312,
-								StartPos:  5129,
-								EndPos:    5131,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 312,
-									EndLine:   312,
-									StartPos:  5129,
-									EndPos:    5131,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 313,
-						EndLine:   313,
-						StartPos:  5133,
-						EndPos:    5143,
-					},
-				},
-				Expr: &ast.ExprAssignPow{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 313,
-							EndLine:   313,
-							StartPos:  5133,
-							EndPos:    5142,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 313,
-								EndLine:   313,
-								StartPos:  5133,
-								EndPos:    5135,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 313,
-									EndLine:   313,
-									StartPos:  5133,
-									EndPos:    5135,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 313,
-								EndLine:   313,
-								StartPos:  5140,
-								EndPos:    5142,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 313,
-									EndLine:   313,
-									StartPos:  5140,
-									EndPos:    5142,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 314,
-						EndLine:   314,
-						StartPos:  5144,
-						EndPos:    5154,
-					},
-				},
-				Expr: &ast.ExprAssignShiftLeft{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 314,
-							EndLine:   314,
-							StartPos:  5144,
-							EndPos:    5153,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 314,
-								EndLine:   314,
-								StartPos:  5144,
-								EndPos:    5146,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 314,
-									EndLine:   314,
-									StartPos:  5144,
-									EndPos:    5146,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 314,
-								EndLine:   314,
-								StartPos:  5151,
-								EndPos:    5153,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 314,
-									EndLine:   314,
-									StartPos:  5151,
-									EndPos:    5153,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 315,
-						EndLine:   315,
-						StartPos:  5155,
-						EndPos:    5165,
-					},
-				},
-				Expr: &ast.ExprAssignShiftRight{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 315,
-							EndLine:   315,
-							StartPos:  5155,
-							EndPos:    5164,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 315,
-								EndLine:   315,
-								StartPos:  5155,
-								EndPos:    5157,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 315,
-									EndLine:   315,
-									StartPos:  5155,
-									EndPos:    5157,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 315,
-								EndLine:   315,
-								StartPos:  5162,
-								EndPos:    5164,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 315,
-									EndLine:   315,
-									StartPos:  5162,
-									EndPos:    5164,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 317,
-						EndLine:   317,
-						StartPos:  5167,
-						EndPos:    5206,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 317,
-							EndLine:   317,
-							StartPos:  5173,
-							EndPos:    5176,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 317,
-								EndLine:   317,
-								StartPos:  5178,
-								EndPos:    5204,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 317,
-									EndLine:   317,
-									StartPos:  5194,
-									EndPos:    5199,
-								},
-							},
-							Value: []byte("class"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 317,
-										EndLine:   317,
-										StartPos:  5178,
-										EndPos:    5184,
-									},
-								},
-								Value: []byte("public"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 317,
-									EndLine:   317,
-									StartPos:  5202,
-									EndPos:    5204,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 318,
-						EndLine:   318,
-						StartPos:  5207,
-						EndPos:    5218,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 318,
-							EndLine:   318,
-							StartPos:  5207,
-							EndPos:    5217,
-						},
-					},
-					Function: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 318,
-								EndLine:   318,
-								StartPos:  5207,
-								EndPos:    5215,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 318,
-										EndLine:   318,
-										StartPos:  5208,
-										EndPos:    5211,
-									},
-								},
-								Value: []byte("foo"),
-							},
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 318,
-										EndLine:   318,
-										StartPos:  5211,
-										EndPos:    5215,
-									},
-								},
-								Value: []byte("bar"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 318,
-								EndLine:   318,
-								StartPos:  5215,
-								EndPos:    5217,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 320,
-						EndLine:   326,
-						StartPos:  5220,
-						EndPos:    5328,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 320,
-							EndLine:   320,
-							StartPos:  5229,
-							EndPos:    5232,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Params: []ast.Vertex{
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 320,
-								EndLine:   320,
-								StartPos:  5233,
-								EndPos:    5236,
-							},
-						},
-						Var: &ast.Reference{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 320,
-									EndLine:   320,
-									StartPos:  5233,
-									EndPos:    5236,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 320,
-										EndLine:   320,
-										StartPos:  5234,
-										EndPos:    5236,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 320,
-											EndLine:   320,
-											StartPos:  5234,
-											EndPos:    5236,
-										},
-									},
-									Value: []byte("$a"),
-								},
-							},
-						},
-					},
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 320,
-								EndLine:   320,
-								StartPos:  5238,
-								EndPos:    5243,
-							},
-						},
-						Var: &ast.Variadic{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 320,
-									EndLine:   320,
-									StartPos:  5238,
-									EndPos:    5243,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 320,
-										EndLine:   320,
-										StartPos:  5241,
-										EndPos:    5243,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 320,
-											EndLine:   320,
-											StartPos:  5241,
-											EndPos:    5243,
-										},
-									},
-									Value: []byte("$b"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtFunction{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 322,
-								EndLine:   322,
-								StartPos:  5252,
-								EndPos:    5269,
-							},
-						},
-						FunctionName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 322,
-									EndLine:   322,
-									StartPos:  5261,
-									EndPos:    5264,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtClass{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 323,
-								EndLine:   323,
-								StartPos:  5274,
-								EndPos:    5286,
-							},
-						},
-						ClassName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 323,
-									EndLine:   323,
-									StartPos:  5280,
-									EndPos:    5283,
-								},
-							},
-							Value: []byte("Baz"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtTrait{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 324,
-								EndLine:   324,
-								StartPos:  5291,
-								EndPos:    5303,
-							},
-						},
-						TraitName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 324,
-									EndLine:   324,
-									StartPos:  5297,
-									EndPos:    5301,
-								},
-							},
-							Value: []byte("Quux"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtInterface{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 325,
-								EndLine:   325,
-								StartPos:  5308,
-								EndPos:    5326,
-							},
-						},
-						InterfaceName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 325,
-									EndLine:   325,
-									StartPos:  5318,
-									EndPos:    5323,
-								},
-							},
-							Value: []byte("Quuux"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 328,
-						EndLine:   328,
-						StartPos:  5330,
-						EndPos:    5373,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 328,
-							EndLine:   328,
-							StartPos:  5339,
-							EndPos:    5342,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Params: []ast.Vertex{
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 328,
-								EndLine:   328,
-								StartPos:  5343,
-								EndPos:    5350,
-							},
-						},
-						Var: &ast.Reference{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 328,
-									EndLine:   328,
-									StartPos:  5343,
-									EndPos:    5346,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 328,
-										EndLine:   328,
-										StartPos:  5344,
-										EndPos:    5346,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 328,
-											EndLine:   328,
-											StartPos:  5344,
-											EndPos:    5346,
-										},
-									},
-									Value: []byte("$a"),
-								},
-							},
-						},
-						DefaultValue: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 328,
-									EndLine:   328,
-									StartPos:  5349,
-									EndPos:    5350,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 328,
-								EndLine:   328,
-								StartPos:  5352,
-								EndPos:    5361,
-							},
-						},
-						Var: &ast.Variadic{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 328,
-									EndLine:   328,
-									StartPos:  5352,
-									EndPos:    5357,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 328,
-										EndLine:   328,
-										StartPos:  5355,
-										EndPos:    5357,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 328,
-											EndLine:   328,
-											StartPos:  5355,
-											EndPos:    5357,
-										},
-									},
-									Value: []byte("$b"),
-								},
-							},
-						},
-						DefaultValue: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 328,
-									EndLine:   328,
-									StartPos:  5360,
-									EndPos:    5361,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 328,
-								EndLine:   328,
-								StartPos:  5363,
-								EndPos:    5369,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 328,
-									EndLine:   328,
-									StartPos:  5363,
-									EndPos:    5365,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 328,
-										EndLine:   328,
-										StartPos:  5363,
-										EndPos:    5365,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-						DefaultValue: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 328,
-									EndLine:   328,
-									StartPos:  5368,
-									EndPos:    5369,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 329,
-						EndLine:   329,
-						StartPos:  5374,
-						EndPos:    5412,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 329,
-							EndLine:   329,
-							StartPos:  5383,
-							EndPos:    5386,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Params: []ast.Vertex{
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 329,
-								EndLine:   329,
-								StartPos:  5387,
-								EndPos:    5395,
-							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 329,
-									EndLine:   329,
-									StartPos:  5387,
-									EndPos:    5392,
-								},
-							},
-							Value: []byte("array"),
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 329,
-									EndLine:   329,
-									StartPos:  5393,
-									EndPos:    5395,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 329,
-										EndLine:   329,
-										StartPos:  5393,
-										EndPos:    5395,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-					},
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 329,
-								EndLine:   329,
-								StartPos:  5397,
-								EndPos:    5408,
-							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 329,
-									EndLine:   329,
-									StartPos:  5397,
-									EndPos:    5405,
-								},
-							},
-							Value: []byte("callable"),
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 329,
-									EndLine:   329,
-									StartPos:  5406,
-									EndPos:    5408,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 329,
-										EndLine:   329,
-										StartPos:  5406,
-										EndPos:    5408,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 330,
-						EndLine:   330,
-						StartPos:  5413,
-						EndPos:    5515,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 330,
-							EndLine:   330,
-							StartPos:  5434,
-							EndPos:    5437,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 330,
-								EndLine:   330,
-								StartPos:  5413,
-								EndPos:    5421,
-							},
-						},
-						Value: []byte("abstract"),
-					},
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 330,
-								EndLine:   330,
-								StartPos:  5422,
-								EndPos:    5427,
-							},
-						},
-						Value: []byte("final"),
-					},
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 330,
-								EndLine:   330,
-								StartPos:  5440,
-								EndPos:    5481,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 330,
-									EndLine:   330,
-									StartPos:  5475,
-									EndPos:    5478,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 330,
-										EndLine:   330,
-										StartPos:  5440,
-										EndPos:    5448,
-									},
-								},
-								Value: []byte("abstract"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 330,
-										EndLine:   330,
-										StartPos:  5449,
-										EndPos:    5458,
-									},
-								},
-								Value: []byte("protected"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 330,
-										EndLine:   330,
-										StartPos:  5459,
-										EndPos:    5465,
-									},
-								},
-								Value: []byte("static"),
-							},
-						},
-						Stmt: &ast.StmtNop{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 330,
-									EndLine:   330,
-									StartPos:  5480,
-									EndPos:    5481,
-								},
-							},
-						},
-					},
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 330,
-								EndLine:   330,
-								StartPos:  5482,
-								EndPos:    5513,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 330,
-									EndLine:   330,
-									StartPos:  5505,
-									EndPos:    5508,
-								},
-							},
-							Value: []byte("baz"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 330,
-										EndLine:   330,
-										StartPos:  5482,
-										EndPos:    5487,
-									},
-								},
-								Value: []byte("final"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 330,
-										EndLine:   330,
-										StartPos:  5488,
-										EndPos:    5495,
-									},
-								},
-								Value: []byte("private"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 330,
-									EndLine:   330,
-									StartPos:  5511,
-									EndPos:    5513,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 332,
-						EndLine:   332,
-						StartPos:  5517,
-						EndPos:    5532,
-					},
-				},
-				Expr: &ast.ExprPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 332,
-							EndLine:   332,
-							StartPos:  5517,
-							EndPos:    5531,
-						},
-					},
-					Var: &ast.ExprNew{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 332,
-								EndLine:   332,
-								StartPos:  5518,
-								EndPos:    5525,
-							},
-						},
-						Class: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 332,
-									EndLine:   332,
-									StartPos:  5522,
-									EndPos:    5525,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 332,
-											EndLine:   332,
-											StartPos:  5522,
-											EndPos:    5525,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					Property: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 332,
-								EndLine:   332,
-								StartPos:  5528,
-								EndPos:    5531,
-							},
-						},
-						Value: []byte("bar"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 333,
-						EndLine:   333,
-						StartPos:  5533,
-						EndPos:    5545,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 333,
-							EndLine:   333,
-							StartPos:  5533,
-							EndPos:    5544,
-						},
-					},
-					Function: &ast.ExprNew{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 333,
-								EndLine:   333,
-								StartPos:  5534,
-								EndPos:    5541,
-							},
-						},
-						Class: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 333,
-									EndLine:   333,
-									StartPos:  5538,
-									EndPos:    5541,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 333,
-											EndLine:   333,
-											StartPos:  5538,
-											EndPos:    5541,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 333,
-								EndLine:   333,
-								StartPos:  5542,
-								EndPos:    5544,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 334,
-						EndLine:   334,
-						StartPos:  5546,
-						EndPos:    5558,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 334,
-							EndLine:   334,
-							StartPos:  5546,
-							EndPos:    5557,
-						},
-					},
-					Function: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 334,
-								EndLine:   334,
-								StartPos:  5546,
-								EndPos:    5555,
-							},
-						},
-						Var: &ast.ExprShortArray{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 334,
-									EndLine:   334,
-									StartPos:  5546,
-									EndPos:    5552,
-								},
-							},
-							Items: []ast.Vertex{
-								&ast.ExprArrayItem{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 334,
-											EndLine:   334,
-											StartPos:  5547,
-											EndPos:    5551,
-										},
-									},
-									Val: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 334,
-												EndLine:   334,
-												StartPos:  5547,
-												EndPos:    5551,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 334,
-													EndLine:   334,
-													StartPos:  5547,
-													EndPos:    5551,
-												},
-											},
-											Value: []byte("$foo"),
-										},
-									},
-								},
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 334,
-									EndLine:   334,
-									StartPos:  5553,
-									EndPos:    5554,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 334,
-								EndLine:   334,
-								StartPos:  5555,
-								EndPos:    5557,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 335,
-						EndLine:   335,
-						StartPos:  5559,
-						EndPos:    5568,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 335,
-							EndLine:   335,
-							StartPos:  5559,
-							EndPos:    5567,
-						},
-					},
-					Function: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 335,
-								EndLine:   335,
-								StartPos:  5559,
-								EndPos:    5565,
-							},
-						},
-						Var: &ast.ExprConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 335,
-									EndLine:   335,
-									StartPos:  5559,
-									EndPos:    5562,
-								},
-							},
-							Const: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 335,
-										EndLine:   335,
-										StartPos:  5559,
-										EndPos:    5562,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 335,
-												EndLine:   335,
-												StartPos:  5559,
-												EndPos:    5562,
-											},
-										},
-										Value: []byte("foo"),
-									},
-								},
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 335,
-									EndLine:   335,
-									StartPos:  5563,
-									EndPos:    5564,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 335,
-								EndLine:   335,
-								StartPos:  5565,
-								EndPos:    5567,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 336,
-						EndLine:   336,
-						StartPos:  5569,
-						EndPos:    5577,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 336,
-							EndLine:   336,
-							StartPos:  5569,
-							EndPos:    5576,
-						},
-					},
-					Function: &ast.ScalarString{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 336,
-								EndLine:   336,
-								StartPos:  5569,
-								EndPos:    5574,
-							},
-						},
-						Value: []byte("\"foo\""),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 336,
-								EndLine:   336,
-								StartPos:  5574,
-								EndPos:    5576,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 337,
-						EndLine:   337,
-						StartPos:  5578,
-						EndPos:    5590,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 337,
-							EndLine:   337,
-							StartPos:  5578,
-							EndPos:    5589,
-						},
-					},
-					Function: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 337,
-								EndLine:   337,
-								StartPos:  5578,
-								EndPos:    5587,
-							},
-						},
-						Var: &ast.ExprShortArray{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 337,
-									EndLine:   337,
-									StartPos:  5578,
-									EndPos:    5581,
-								},
-							},
-							Items: []ast.Vertex{
-								&ast.ExprArrayItem{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 337,
-											EndLine:   337,
-											StartPos:  5579,
-											EndPos:    5580,
-										},
-									},
-									Val: &ast.ScalarLnumber{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 337,
-												EndLine:   337,
-												StartPos:  5579,
-												EndPos:    5580,
-											},
-										},
-										Value: []byte("1"),
-									},
-								},
-							},
-						},
-						Dim: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 337,
-									EndLine:   337,
-									StartPos:  5582,
-									EndPos:    5586,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 337,
-										EndLine:   337,
-										StartPos:  5582,
-										EndPos:    5586,
-									},
-								},
-								Value: []byte("$foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 337,
-								EndLine:   337,
-								StartPos:  5587,
-								EndPos:    5589,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 338,
-						EndLine:   338,
-						StartPos:  5591,
-						EndPos:    5600,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 338,
-							EndLine:   338,
-							StartPos:  5591,
-							EndPos:    5599,
-						},
-					},
-					VarName: &ast.ExprFunctionCall{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 338,
-								EndLine:   338,
-								StartPos:  5593,
-								EndPos:    5598,
-							},
-						},
-						Function: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 338,
-									EndLine:   338,
-									StartPos:  5593,
-									EndPos:    5596,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 338,
-											EndLine:   338,
-											StartPos:  5593,
-											EndPos:    5596,
-										},
-									},
-									Value: []byte("foo"),
-								},
-							},
-						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 338,
-									EndLine:   338,
-									StartPos:  5596,
-									EndPos:    5598,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 340,
-						EndLine:   340,
-						StartPos:  5602,
-						EndPos:    5614,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 340,
-							EndLine:   340,
-							StartPos:  5602,
-							EndPos:    5613,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 340,
-								EndLine:   340,
-								StartPos:  5602,
-								EndPos:    5605,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 340,
-										EndLine:   340,
-										StartPos:  5602,
-										EndPos:    5605,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 340,
-								EndLine:   340,
-								StartPos:  5607,
-								EndPos:    5611,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 340,
-									EndLine:   340,
-									StartPos:  5607,
-									EndPos:    5611,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 340,
-								EndLine:   340,
-								StartPos:  5611,
-								EndPos:    5613,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 341,
-						EndLine:   341,
-						StartPos:  5615,
-						EndPos:    5632,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 341,
-							EndLine:   341,
-							StartPos:  5615,
-							EndPos:    5631,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 341,
-								EndLine:   341,
-								StartPos:  5615,
-								EndPos:    5618,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 341,
-										EndLine:   341,
-										StartPos:  5615,
-										EndPos:    5618,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 341,
-								EndLine:   341,
-								StartPos:  5621,
-								EndPos:    5628,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 341,
-									EndLine:   341,
-									StartPos:  5621,
-									EndPos:    5625,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 341,
-										EndLine:   341,
-										StartPos:  5621,
-										EndPos:    5625,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 341,
-									EndLine:   341,
-									StartPos:  5626,
-									EndPos:    5627,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 341,
-								EndLine:   341,
-								StartPos:  5629,
-								EndPos:    5631,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 343,
-						EndLine:   343,
-						StartPos:  5634,
-						EndPos:    5645,
-					},
-				},
-				Expr: &ast.ExprPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 343,
-							EndLine:   343,
-							StartPos:  5634,
-							EndPos:    5644,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 343,
-								EndLine:   343,
-								StartPos:  5634,
-								EndPos:    5638,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 343,
-									EndLine:   343,
-									StartPos:  5634,
-									EndPos:    5638,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 343,
-								EndLine:   343,
-								StartPos:  5640,
-								EndPos:    5644,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 343,
-									EndLine:   343,
-									StartPos:  5640,
-									EndPos:    5644,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 344,
-						EndLine:   344,
-						StartPos:  5646,
-						EndPos:    5662,
-					},
-				},
-				Expr: &ast.ExprPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 344,
-							EndLine:   344,
-							StartPos:  5646,
-							EndPos:    5660,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 344,
-								EndLine:   344,
-								StartPos:  5646,
-								EndPos:    5650,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 344,
-									EndLine:   344,
-									StartPos:  5646,
-									EndPos:    5650,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					Property: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 344,
-								EndLine:   344,
-								StartPos:  5653,
-								EndPos:    5660,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 344,
-									EndLine:   344,
-									StartPos:  5653,
-									EndPos:    5657,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 344,
-										EndLine:   344,
-										StartPos:  5653,
-										EndPos:    5657,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 344,
-									EndLine:   344,
-									StartPos:  5658,
-									EndPos:    5659,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 346,
-						EndLine:   346,
-						StartPos:  5664,
-						EndPos:    5686,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 346,
-							EndLine:   346,
-							StartPos:  5664,
-							EndPos:    5685,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 346,
-									EndLine:   346,
-									StartPos:  5665,
-									EndPos:    5671,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 346,
-										EndLine:   346,
-										StartPos:  5665,
-										EndPos:    5666,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 346,
-										EndLine:   346,
-										StartPos:  5668,
-										EndPos:    5671,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 346,
-											EndLine:   346,
-											StartPos:  5669,
-											EndPos:    5671,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 346,
-												EndLine:   346,
-												StartPos:  5669,
-												EndPos:    5671,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-						},
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 346,
-									EndLine:   346,
-									StartPos:  5673,
-									EndPos:    5684,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 346,
-										EndLine:   346,
-										StartPos:  5673,
-										EndPos:    5674,
-									},
-								},
-								Value: []byte("2"),
-							},
-							Val: &ast.ExprList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 346,
-										EndLine:   346,
-										StartPos:  5676,
-										EndPos:    5684,
-									},
-								},
-								Items: []ast.Vertex{
-									&ast.ExprArrayItem{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 346,
-												EndLine:   346,
-												StartPos:  5681,
-												EndPos:    5683,
-											},
-										},
-										Val: &ast.ExprVariable{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 346,
-													EndLine:   346,
-													StartPos:  5681,
-													EndPos:    5683,
-												},
-											},
-											VarName: &ast.Identifier{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 346,
-														EndLine:   346,
-														StartPos:  5681,
-														EndPos:    5683,
-													},
-												},
-												Value: []byte("$b"),
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtHaltCompiler{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 348,
-						EndLine:   348,
-						StartPos:  5688,
-						EndPos:    5706,
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer(src, "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestPhp5Strings(t *testing.T) {
-	src := `<?
-		"test";
-		"\$test";
-		"
-			test
-		";
-		'$test';
-		'
-			$test
-		';
-	`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   10,
-				StartPos:  5,
-				EndPos:    70,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 2,
-						EndLine:   2,
-						StartPos:  5,
-						EndPos:    12,
-					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 2,
-							EndLine:   2,
-							StartPos:  5,
-							EndPos:    11,
-						},
-					},
-					Value: []byte("\"test\""),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 3,
-						EndLine:   3,
-						StartPos:  15,
-						EndPos:    24,
-					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 3,
-							EndLine:   3,
-							StartPos:  15,
-							EndPos:    23,
-						},
-					},
-					Value: []byte("\"\\$test\""),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 4,
-						EndLine:   6,
-						StartPos:  27,
-						EndPos:    41,
-					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 4,
-							EndLine:   6,
-							StartPos:  27,
-							EndPos:    40,
-						},
-					},
-					Value: []byte("\"\n\t\t\ttest\n\t\t\""),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 7,
-						EndLine:   7,
-						StartPos:  44,
-						EndPos:    52,
-					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 7,
-							EndLine:   7,
-							StartPos:  44,
-							EndPos:    51,
-						},
-					},
-					Value: []byte("'$test'"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 8,
-						EndLine:   10,
-						StartPos:  55,
-						EndPos:    70,
-					},
-				},
-				Expr: &ast.ScalarString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 8,
-							EndLine:   10,
-							StartPos:  55,
-							EndPos:    69,
-						},
-					},
-					Value: []byte("'\n\t\t\t$test\n\t\t'"),
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestPhp5Heredoc(t *testing.T) {
-	src := `<?
-		<<<CAD
-CAD;
-		<<<CAD
-	hello
-CAD;
-		<<<"CAD"
-	hello
-CAD;
-		<<<"CAD"
-	hello $world
-CAD;
-		<<<'CAD'
-	hello $world
-CAD;
-	`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   15,
-				StartPos:  5,
-				EndPos:    120,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 2,
-						EndLine:   3,
-						StartPos:  5,
-						EndPos:    16,
-					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 2,
-							EndLine:   3,
-							StartPos:  5,
-							EndPos:    15,
-						},
-					},
-					Label: []byte("<<<CAD\n"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 4,
-						EndLine:   6,
-						StartPos:  19,
-						EndPos:    37,
-					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 4,
-							EndLine:   6,
-							StartPos:  19,
-							EndPos:    36,
-						},
-					},
-					Label: []byte("<<<CAD\n"),
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 5,
-									EndLine:   5,
-									StartPos:  26,
-									EndPos:    33,
-								},
-							},
-							Value: []byte("\thello\n"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 7,
-						EndLine:   9,
-						StartPos:  40,
-						EndPos:    60,
-					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 7,
-							EndLine:   9,
-							StartPos:  40,
-							EndPos:    59,
-						},
-					},
-					Label: []byte("<<<\"CAD\"\n"),
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 8,
-									EndLine:   8,
-									StartPos:  49,
-									EndPos:    56,
-								},
-							},
-							Value: []byte("\thello\n"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 10,
-						EndLine:   12,
-						StartPos:  63,
-						EndPos:    90,
-					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 10,
-							EndLine:   12,
-							StartPos:  63,
-							EndPos:    89,
-						},
-					},
-					Label: []byte("<<<\"CAD\"\n"),
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 11,
-									EndLine:   11,
-									StartPos:  72,
-									EndPos:    79,
-								},
-							},
-							Value: []byte("\thello "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 11,
-									EndLine:   11,
-									StartPos:  79,
-									EndPos:    85,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 11,
-										EndLine:   11,
-										StartPos:  79,
-										EndPos:    85,
-									},
-								},
-								Value: []byte("$world"),
-							},
-						},
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 11,
-									EndLine:   11,
-									StartPos:  85,
-									EndPos:    86,
-								},
-							},
-							Value: []byte("\n"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 13,
-						EndLine:   15,
-						StartPos:  93,
-						EndPos:    120,
-					},
-				},
-				Expr: &ast.ScalarHeredoc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 13,
-							EndLine:   15,
-							StartPos:  93,
-							EndPos:    119,
-						},
-					},
-					Label: []byte("<<<'CAD'\n"),
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 14,
-									EndLine:   14,
-									StartPos:  102,
-									EndPos:    116,
-								},
-							},
-							Value: []byte("\thello $world\n"),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", nil)
-	php7parser := php7.NewParser(lexer, nil)
-	php7parser.Parse()
-	actual := php7parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestPhp7ControlCharsErrors(t *testing.T) {
-	src := "<?php \004 echo $b; \"$a[\005test]\";"
-
-	expected := []*errors.Error{
-		{
-			Msg: "WARNING: Unexpected character in input: '\004' (ASCII=4)",
-			Pos: &position.Position{StartLine: 1, EndLine: 1, StartPos: 6, EndPos: 7},
-		},
-		{
-			Msg: "WARNING: Unexpected character in input: '\005' (ASCII=5)",
-			Pos: &position.Position{StartLine: 1, EndLine: 1, StartPos: 21, EndPos: 22},
-		},
-	}
-
-	parserErrors := []*errors.Error{}
-	errorHandlerFunc := func(e *errors.Error) {
-		parserErrors = append(parserErrors, e)
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "7.4", errorHandlerFunc)
-	php7parser := php7.NewParser(lexer, errorHandlerFunc)
-	php7parser.Parse()
-	assert.DeepEqual(t, expected, parserErrors)
-}