diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go
index a2b90ea..b4a4ee9 100644
--- a/internal/php5/parser_test.go
+++ b/internal/php5/parser_test.go
@@ -8,849 +8,1396 @@ import (
 	"github.com/z7zmey/php-parser/internal/php5"
 	"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"
+	"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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
 func TestPhp5ArgumentNode(t *testing.T) {
-	src := `<? 
+	src := `<?
 		foo($a, ...$b);
 		$foo($a, ...$b);
 		$foo->bar($a, ...$b);
 		foo::bar($a, ...$b);
 		$foo::bar($a, ...$b);
-		new foo($a, ...$b);
-	`
+		new foo($a, ...$b);`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   7,
-				StartPos:  6,
-				EndPos:    133,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   7,
+			StartPos:  5,
+			EndPos:    132,
 		},
 		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,
 									},
-								},
-								Variadic:    false,
-								IsReference: 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,
-									},
-								},
-								IsReference: false,
-								Variadic:    true,
-								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"),
+								},
 							},
 						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 7,
-										EndLine:   7,
-										StartPos:  122,
-										EndPos:    124,
-									},
+						&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,
 								},
-								Variadic:    false,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
 										Position: &position.Position{
 											StartLine: 7,
 											EndLine:   7,
-											StartPos:  122,
-											EndPos:    124,
+											StartPos:  124,
+											EndPos:    125,
 										},
 									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 7,
-												EndLine:   7,
-												StartPos:  122,
-												EndPos:    124,
-											},
-										},
-										Value: []byte("$a"),
-									},
 								},
 							},
-							&ast.Argument{
-								Node: ast.Node{
+							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:  126,
-										EndPos:    131,
+										StartPos:  128,
+										EndPos:    130,
 									},
-								},
-								Variadic:    true,
-								IsReference: false,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$b"),
 										Position: &position.Position{
 											StartLine: 7,
 											EndLine:   7,
-											StartPos:  129,
-											EndPos:    131,
+											StartPos:  128,
+											EndPos:    130,
 										},
 									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 7,
-												EndLine:   7,
-												StartPos:  129,
-												EndPos:    131,
-											},
-										},
-										Value: []byte("$b"),
-									},
+									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,
+					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -859,61 +1406,122 @@ func TestPhp5ParameterNode(t *testing.T) {
 		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) {};
-	`
+		static function(bar $bar=null, baz &...$baz) {};`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   5,
-				StartPos:  5,
-				EndPos:    210,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   5,
+			StartPos:  5,
+			EndPos:    210,
 		},
 		Stmts: []ast.Vertex{
 			&ast.StmtFunction{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 2,
+					EndLine:   2,
+					StartPos:  5,
+					EndPos:    49,
+				},
+				FunctionTkn: &token.Token{
+					ID:    token.T_FUNCTION,
+					Value: []byte("function"),
 					Position: &position.Position{
 						StartLine: 2,
 						EndLine:   2,
 						StartPos:  5,
-						EndPos:    49,
+						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:    31,
+						},
+						Type: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
 								StartPos:  18,
-								EndPos:    31,
-							},
-						},
-						Type: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 2,
-									EndLine:   2,
-									StartPos:  18,
-									EndPos:    21,
-								},
+								EndPos:    21,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  18,
+										EndPos:    21,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("bar"),
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
@@ -926,47 +1534,79 @@ func TestPhp5ParameterNode(t *testing.T) {
 							},
 						},
 						Var: &ast.ExprVariable{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  22,
+								EndPos:    26,
+							},
+							VarName: &ast.Identifier{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
 									StartPos:  22,
 									EndPos:    26,
 								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$bar"),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
 										StartPos:  22,
 										EndPos:    26,
 									},
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
+											Position: &position.Position{
+												StartLine: 2,
+												EndLine:   2,
+												StartPos:  21,
+												EndPos:    22,
+											},
+										},
+									},
 								},
 								Value: []byte("$bar"),
 							},
 						},
+						EqualTkn: &token.Token{
+							ID:    token.ID(61),
+							Value: []byte("="),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  26,
+								EndPos:    27,
+							},
+						},
 						DefaultValue: &ast.ExprConstFetch{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  27,
+								EndPos:    31,
+							},
+							Const: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 2,
 									EndLine:   2,
 									StartPos:  27,
 									EndPos:    31,
 								},
-							},
-							Const: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 2,
-										EndLine:   2,
-										StartPos:  27,
-										EndPos:    31,
-									},
-								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 2,
+											EndLine:   2,
+											StartPos:  27,
+											EndPos:    31,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("null"),
 											Position: &position.Position{
 												StartLine: 2,
 												EndLine:   2,
@@ -981,126 +1621,271 @@ func TestPhp5ParameterNode(t *testing.T) {
 						},
 					},
 					&ast.Parameter{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  33,
+							EndPos:    45,
+						},
+						Type: &ast.NameName{
 							Position: &position.Position{
 								StartLine: 2,
 								EndLine:   2,
 								StartPos:  33,
-								EndPos:    45,
-							},
-						},
-						Type: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 2,
-									EndLine:   2,
-									StartPos:  33,
-									EndPos:    36,
-								},
+								EndPos:    36,
 							},
 							Parts: []ast.Vertex{
 								&ast.NameNamePart{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  33,
+										EndPos:    36,
+									},
+									StringTkn: &token.Token{
+										ID:    token.T_STRING,
+										Value: []byte("baz"),
 										Position: &position.Position{
 											StartLine: 2,
 											EndLine:   2,
 											StartPos:  33,
 											EndPos:    36,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 2,
+													EndLine:   2,
+													StartPos:  32,
+													EndPos:    33,
+												},
+											},
+										},
 									},
 									Value: []byte("baz"),
 								},
 							},
 						},
-						Var: &ast.Reference{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 2,
-									EndLine:   2,
-									StartPos:  37,
-									EndPos:    45,
-								},
+						AmpersandTkn: &token.Token{
+							ID:    token.ID(38),
+							Value: []byte("&"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  37,
+								EndPos:    38,
 							},
-							Var: &ast.Variadic{
-								Node: ast.Node{
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
 									Position: &position.Position{
 										StartLine: 2,
 										EndLine:   2,
-										StartPos:  38,
+										StartPos:  36,
+										EndPos:    37,
+									},
+								},
+							},
+						},
+						VariadicTkn: &token.Token{
+							ID:    token.T_ELLIPSIS,
+							Value: []byte("..."),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  38,
+								EndPos:    41,
+							},
+						},
+						Var: &ast.ExprVariable{
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  41,
+								EndPos:    45,
+							},
+							VarName: &ast.Identifier{
+								Position: &position.Position{
+									StartLine: 2,
+									EndLine:   2,
+									StartPos:  41,
+									EndPos:    45,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_VARIABLE,
+									Value: []byte("$baz"),
+									Position: &position.Position{
+										StartLine: 2,
+										EndLine:   2,
+										StartPos:  41,
 										EndPos:    45,
 									},
 								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 2,
-											EndLine:   2,
-											StartPos:  41,
-											EndPos:    45,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 2,
-												EndLine:   2,
-												StartPos:  41,
-												EndPos:    45,
-											},
-										},
-										Value: []byte("$baz"),
-									},
-								},
+								Value: []byte("$baz"),
+							},
+						},
+					},
+				},
+				SeparatorTkns: []*token.Token{
+					{
+						ID:    token.ID(44),
+						Value: []byte(","),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  31,
+							EndPos:    32,
+						},
+					},
+				},
+				CloseParenthesisTkn: &token.Token{
+					ID:    token.ID(41),
+					Value: []byte(")"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  45,
+						EndPos:    46,
+					},
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  47,
+						EndPos:    48,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   2,
+								StartPos:  46,
+								EndPos:    47,
 							},
 						},
 					},
 				},
 				Stmts: []ast.Vertex{},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 2,
+						EndLine:   2,
+						StartPos:  48,
+						EndPos:    49,
+					},
+				},
 			},
 			&ast.StmtClass{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 3,
+					EndLine:   3,
+					StartPos:  52,
+					EndPos:    115,
+				},
+				ClassTkn: &token.Token{
+					ID:    token.T_CLASS,
+					Value: []byte("class"),
 					Position: &position.Position{
 						StartLine: 3,
 						EndLine:   3,
 						StartPos:  52,
-						EndPos:    115,
+						EndPos:    57,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
+							Position: &position.Position{
+								StartLine: 2,
+								EndLine:   3,
+								StartPos:  49,
+								EndPos:    52,
+							},
+						},
 					},
 				},
 				ClassName: &ast.Identifier{
-					Node: ast.Node{
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  58,
+						EndPos:    61,
+					},
+					IdentifierTkn: &token.Token{
+						ID:    token.T_STRING,
+						Value: []byte("foo"),
 						Position: &position.Position{
 							StartLine: 3,
 							EndLine:   3,
 							StartPos:  58,
 							EndPos:    61,
 						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 3,
-								EndLine:   3,
-								StartPos:  63,
-								EndPos:    114,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
-									StartPos:  79,
-									EndPos:    82,
+									StartPos:  57,
+									EndPos:    58,
 								},
 							},
-							Value: []byte("foo"),
+						},
+					},
+					Value: []byte("foo"),
+				},
+				OpenCurlyBracketTkn: &token.Token{
+					ID:    token.ID(123),
+					Value: []byte("{"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  62,
+						EndPos:    63,
+					},
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte(" "),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  61,
+								EndPos:    62,
+							},
+						},
+					},
+				},
+				Stmts: []ast.Vertex{
+					&ast.StmtClassMethod{
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  63,
+							EndPos:    114,
 						},
 						Modifiers: []ast.Vertex{
 							&ast.Identifier{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  63,
+									EndPos:    69,
+								},
+								IdentifierTkn: &token.Token{
+									ID:    token.T_PUBLIC,
+									Value: []byte("public"),
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
@@ -1111,28 +1896,95 @@ func TestPhp5ParameterNode(t *testing.T) {
 								Value: []byte("public"),
 							},
 						},
+						FunctionTkn: &token.Token{
+							ID:    token.T_FUNCTION,
+							Value: []byte("function"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  70,
+								EndPos:    78,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte(" "),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  69,
+										EndPos:    70,
+									},
+								},
+							},
+						},
+						MethodName: &ast.Identifier{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  79,
+								EndPos:    82,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_STRING,
+								Value: []byte("foo"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  79,
+									EndPos:    82,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  78,
+											EndPos:    79,
+										},
+									},
+								},
+							},
+							Value: []byte("foo"),
+						},
+						OpenParenthesisTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  82,
+								EndPos:    83,
+							},
+						},
 						Params: []ast.Vertex{
 							&ast.Parameter{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  83,
+									EndPos:    96,
+								},
+								Type: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
 										StartPos:  83,
-										EndPos:    96,
-									},
-								},
-								Type: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  83,
-											EndPos:    86,
-										},
+										EndPos:    86,
 									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 3,
+												EndLine:   3,
+												StartPos:  83,
+												EndPos:    86,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("bar"),
 												Position: &position.Position{
 													StartLine: 3,
 													EndLine:   3,
@@ -1145,47 +1997,79 @@ func TestPhp5ParameterNode(t *testing.T) {
 									},
 								},
 								Var: &ast.ExprVariable{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  87,
+										EndPos:    91,
+									},
+									VarName: &ast.Identifier{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
 											StartPos:  87,
 											EndPos:    91,
 										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$bar"),
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
 												StartPos:  87,
 												EndPos:    91,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 3,
+														EndLine:   3,
+														StartPos:  86,
+														EndPos:    87,
+													},
+												},
+											},
 										},
 										Value: []byte("$bar"),
 									},
 								},
+								EqualTkn: &token.Token{
+									ID:    token.ID(61),
+									Value: []byte("="),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  91,
+										EndPos:    92,
+									},
+								},
 								DefaultValue: &ast.ExprConstFetch{
-									Node: ast.Node{
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  92,
+										EndPos:    96,
+									},
+									Const: &ast.NameName{
 										Position: &position.Position{
 											StartLine: 3,
 											EndLine:   3,
 											StartPos:  92,
 											EndPos:    96,
 										},
-									},
-									Const: &ast.NameName{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 3,
-												EndLine:   3,
-												StartPos:  92,
-												EndPos:    96,
-											},
-										},
 										Parts: []ast.Vertex{
 											&ast.NameNamePart{
-												Node: ast.Node{
+												Position: &position.Position{
+													StartLine: 3,
+													EndLine:   3,
+													StartPos:  92,
+													EndPos:    96,
+												},
+												StringTkn: &token.Token{
+													ID:    token.T_STRING,
+													Value: []byte("null"),
 													Position: &position.Position{
 														StartLine: 3,
 														EndLine:   3,
@@ -1200,134 +2084,262 @@ func TestPhp5ParameterNode(t *testing.T) {
 								},
 							},
 							&ast.Parameter{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  98,
+									EndPos:    110,
+								},
+								Type: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 3,
 										EndLine:   3,
 										StartPos:  98,
-										EndPos:    110,
-									},
-								},
-								Type: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  98,
-											EndPos:    101,
-										},
+										EndPos:    101,
 									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 3,
+												EndLine:   3,
+												StartPos:  98,
+												EndPos:    101,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("baz"),
 												Position: &position.Position{
 													StartLine: 3,
 													EndLine:   3,
 													StartPos:  98,
 													EndPos:    101,
 												},
+												FreeFloating: []*token.Token{
+													{
+														ID:    token.T_WHITESPACE,
+														Value: []byte(" "),
+														Position: &position.Position{
+															StartLine: 3,
+															EndLine:   3,
+															StartPos:  97,
+															EndPos:    98,
+														},
+													},
+												},
 											},
 											Value: []byte("baz"),
 										},
 									},
 								},
-								Var: &ast.Reference{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 3,
-											EndLine:   3,
-											StartPos:  102,
-											EndPos:    110,
-										},
+								AmpersandTkn: &token.Token{
+									ID:    token.ID(38),
+									Value: []byte("&"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  102,
+										EndPos:    103,
 									},
-									Var: &ast.Variadic{
-										Node: ast.Node{
+									FreeFloating: []*token.Token{
+										{
+											ID:    token.T_WHITESPACE,
+											Value: []byte(" "),
 											Position: &position.Position{
 												StartLine: 3,
 												EndLine:   3,
-												StartPos:  103,
-												EndPos:    110,
-											},
-										},
-										Var: &ast.ExprVariable{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 3,
-													EndLine:   3,
-													StartPos:  106,
-													EndPos:    110,
-												},
-											},
-											VarName: &ast.Identifier{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 3,
-														EndLine:   3,
-														StartPos:  106,
-														EndPos:    110,
-													},
-												},
-												Value: []byte("$baz"),
+												StartPos:  101,
+												EndPos:    102,
 											},
 										},
 									},
 								},
+								VariadicTkn: &token.Token{
+									ID:    token.T_ELLIPSIS,
+									Value: []byte("..."),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  103,
+										EndPos:    106,
+									},
+								},
+								Var: &ast.ExprVariable{
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   3,
+										StartPos:  106,
+										EndPos:    110,
+									},
+									VarName: &ast.Identifier{
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  106,
+											EndPos:    110,
+										},
+										IdentifierTkn: &token.Token{
+											ID:    token.T_VARIABLE,
+											Value: []byte("$baz"),
+											Position: &position.Position{
+												StartLine: 3,
+												EndLine:   3,
+												StartPos:  106,
+												EndPos:    110,
+											},
+										},
+										Value: []byte("$baz"),
+									},
+								},
+							},
+						},
+						SeparatorTkns: []*token.Token{
+							{
+								ID:    token.ID(44),
+								Value: []byte(","),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  96,
+									EndPos:    97,
+								},
+							},
+						},
+						CloseParenthesisTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  110,
+								EndPos:    111,
 							},
 						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 3,
+								EndLine:   3,
+								StartPos:  112,
+								EndPos:    114,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 3,
 									EndLine:   3,
 									StartPos:  112,
-									EndPos:    114,
+									EndPos:    113,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 3,
+											EndLine:   3,
+											StartPos:  111,
+											EndPos:    112,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   3,
+									StartPos:  113,
+									EndPos:    114,
+								},
+							},
 						},
 					},
 				},
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
+					Position: &position.Position{
+						StartLine: 3,
+						EndLine:   3,
+						StartPos:  114,
+						EndPos:    115,
+					},
+				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 4,
+					EndLine:   4,
+					StartPos:  118,
+					EndPos:    159,
+				},
+				Expr: &ast.ExprClosure{
 					Position: &position.Position{
 						StartLine: 4,
 						EndLine:   4,
 						StartPos:  118,
-						EndPos:    159,
+						EndPos:    158,
 					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
+					FunctionTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
 						Position: &position.Position{
 							StartLine: 4,
 							EndLine:   4,
 							StartPos:  118,
-							EndPos:    158,
+							EndPos:    126,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 3,
+									EndLine:   4,
+									StartPos:  115,
+									EndPos:    118,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  126,
+							EndPos:    127,
 						},
 					},
 					Params: []ast.Vertex{
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  127,
+								EndPos:    140,
+							},
+							Type: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
 									StartPos:  127,
-									EndPos:    140,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  127,
-										EndPos:    130,
-									},
+									EndPos:    130,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  127,
+											EndPos:    130,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("bar"),
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
@@ -1340,47 +2352,79 @@ func TestPhp5ParameterNode(t *testing.T) {
 								},
 							},
 							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  131,
+									EndPos:    135,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
 										StartPos:  131,
 										EndPos:    135,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$bar"),
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
 											StartPos:  131,
 											EndPos:    135,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 4,
+													EndLine:   4,
+													StartPos:  130,
+													EndPos:    131,
+												},
+											},
+										},
 									},
 									Value: []byte("$bar"),
 								},
 							},
+							EqualTkn: &token.Token{
+								ID:    token.ID(61),
+								Value: []byte("="),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  135,
+									EndPos:    136,
+								},
+							},
 							DefaultValue: &ast.ExprConstFetch{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  136,
+									EndPos:    140,
+								},
+								Const: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 4,
 										EndLine:   4,
 										StartPos:  136,
 										EndPos:    140,
 									},
-								},
-								Const: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 4,
-											EndLine:   4,
-											StartPos:  136,
-											EndPos:    140,
-										},
-									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 4,
+												EndLine:   4,
+												StartPos:  136,
+												EndPos:    140,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("null"),
 												Position: &position.Position{
 													StartLine: 4,
 													EndLine:   4,
@@ -1395,124 +2439,275 @@ func TestPhp5ParameterNode(t *testing.T) {
 							},
 						},
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  142,
+								EndPos:    154,
+							},
+							Type: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 4,
 									EndLine:   4,
 									StartPos:  142,
-									EndPos:    154,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  142,
-										EndPos:    145,
-									},
+									EndPos:    145,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  142,
+											EndPos:    145,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("baz"),
 											Position: &position.Position{
 												StartLine: 4,
 												EndLine:   4,
 												StartPos:  142,
 												EndPos:    145,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 4,
+														EndLine:   4,
+														StartPos:  141,
+														EndPos:    142,
+													},
+												},
+											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.Reference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  146,
-										EndPos:    154,
-									},
+							AmpersandTkn: &token.Token{
+								ID:    token.ID(38),
+								Value: []byte("&"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  146,
+									EndPos:    147,
 								},
-								Var: &ast.Variadic{
-									Node: ast.Node{
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
 										Position: &position.Position{
 											StartLine: 4,
 											EndLine:   4,
-											StartPos:  147,
+											StartPos:  145,
+											EndPos:    146,
+										},
+									},
+								},
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  147,
+									EndPos:    150,
+								},
+							},
+							Var: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  150,
+									EndPos:    154,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 4,
+										EndLine:   4,
+										StartPos:  150,
+										EndPos:    154,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$baz"),
+										Position: &position.Position{
+											StartLine: 4,
+											EndLine:   4,
+											StartPos:  150,
 											EndPos:    154,
 										},
 									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 4,
-												EndLine:   4,
-												StartPos:  150,
-												EndPos:    154,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 4,
-													EndLine:   4,
-													StartPos:  150,
-													EndPos:    154,
-												},
-											},
-											Value: []byte("$baz"),
-										},
-									},
+									Value: []byte("$baz"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 4,
+								EndLine:   4,
+								StartPos:  140,
+								EndPos:    141,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  154,
+							EndPos:    155,
+						},
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  156,
+							EndPos:    157,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   4,
+									StartPos:  155,
+									EndPos:    156,
 								},
 							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 4,
+							EndLine:   4,
+							StartPos:  157,
+							EndPos:    158,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 4,
+						EndLine:   4,
+						StartPos:  158,
+						EndPos:    159,
+					},
 				},
 			},
 			&ast.StmtExpression{
-				Node: ast.Node{
+				Position: &position.Position{
+					StartLine: 5,
+					EndLine:   5,
+					StartPos:  162,
+					EndPos:    210,
+				},
+				Expr: &ast.ExprClosure{
 					Position: &position.Position{
 						StartLine: 5,
 						EndLine:   5,
 						StartPos:  162,
-						EndPos:    210,
+						EndPos:    209,
 					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
+					StaticTkn: &token.Token{
+						ID:    token.T_STATIC,
+						Value: []byte("static"),
 						Position: &position.Position{
 							StartLine: 5,
 							EndLine:   5,
 							StartPos:  162,
-							EndPos:    209,
+							EndPos:    168,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte("\n\t\t"),
+								Position: &position.Position{
+									StartLine: 4,
+									EndLine:   5,
+									StartPos:  159,
+									EndPos:    162,
+								},
+							},
+						},
+					},
+					FunctionTkn: &token.Token{
+						ID:    token.T_FUNCTION,
+						Value: []byte("function"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  169,
+							EndPos:    177,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  168,
+									EndPos:    169,
+								},
+							},
+						},
+					},
+					OpenParenthesisTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  177,
+							EndPos:    178,
 						},
 					},
-					Static: true,
 					Params: []ast.Vertex{
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  178,
+								EndPos:    191,
+							},
+							Type: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 5,
 									EndLine:   5,
 									StartPos:  178,
-									EndPos:    191,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  178,
-										EndPos:    181,
-									},
+									EndPos:    181,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  178,
+											EndPos:    181,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("bar"),
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
@@ -1525,47 +2720,79 @@ func TestPhp5ParameterNode(t *testing.T) {
 								},
 							},
 							Var: &ast.ExprVariable{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  182,
+									EndPos:    186,
+								},
+								VarName: &ast.Identifier{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
 										StartPos:  182,
 										EndPos:    186,
 									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$bar"),
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
 											StartPos:  182,
 											EndPos:    186,
 										},
+										FreeFloating: []*token.Token{
+											{
+												ID:    token.T_WHITESPACE,
+												Value: []byte(" "),
+												Position: &position.Position{
+													StartLine: 5,
+													EndLine:   5,
+													StartPos:  181,
+													EndPos:    182,
+												},
+											},
+										},
 									},
 									Value: []byte("$bar"),
 								},
 							},
+							EqualTkn: &token.Token{
+								ID:    token.ID(61),
+								Value: []byte("="),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  186,
+									EndPos:    187,
+								},
+							},
 							DefaultValue: &ast.ExprConstFetch{
-								Node: ast.Node{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  187,
+									EndPos:    191,
+								},
+								Const: &ast.NameName{
 									Position: &position.Position{
 										StartLine: 5,
 										EndLine:   5,
 										StartPos:  187,
 										EndPos:    191,
 									},
-								},
-								Const: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 5,
-											EndLine:   5,
-											StartPos:  187,
-											EndPos:    191,
-										},
-									},
 									Parts: []ast.Vertex{
 										&ast.NameNamePart{
-											Node: ast.Node{
+											Position: &position.Position{
+												StartLine: 5,
+												EndLine:   5,
+												StartPos:  187,
+												EndPos:    191,
+											},
+											StringTkn: &token.Token{
+												ID:    token.T_STRING,
+												Value: []byte("null"),
 												Position: &position.Position{
 													StartLine: 5,
 													EndLine:   5,
@@ -1580,81 +2807,234 @@ func TestPhp5ParameterNode(t *testing.T) {
 							},
 						},
 						&ast.Parameter{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  193,
+								EndPos:    205,
+							},
+							Type: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 5,
 									EndLine:   5,
 									StartPos:  193,
-									EndPos:    205,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  193,
-										EndPos:    196,
-									},
+									EndPos:    196,
 								},
 								Parts: []ast.Vertex{
 									&ast.NameNamePart{
-										Node: ast.Node{
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  193,
+											EndPos:    196,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("baz"),
 											Position: &position.Position{
 												StartLine: 5,
 												EndLine:   5,
 												StartPos:  193,
 												EndPos:    196,
 											},
+											FreeFloating: []*token.Token{
+												{
+													ID:    token.T_WHITESPACE,
+													Value: []byte(" "),
+													Position: &position.Position{
+														StartLine: 5,
+														EndLine:   5,
+														StartPos:  192,
+														EndPos:    193,
+													},
+												},
+											},
 										},
 										Value: []byte("baz"),
 									},
 								},
 							},
-							Var: &ast.Reference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 5,
-										EndLine:   5,
-										StartPos:  197,
-										EndPos:    205,
-									},
+							AmpersandTkn: &token.Token{
+								ID:    token.ID(38),
+								Value: []byte("&"),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  197,
+									EndPos:    198,
 								},
-								Var: &ast.Variadic{
-									Node: ast.Node{
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
 										Position: &position.Position{
 											StartLine: 5,
 											EndLine:   5,
-											StartPos:  198,
+											StartPos:  196,
+											EndPos:    197,
+										},
+									},
+								},
+							},
+							VariadicTkn: &token.Token{
+								ID:    token.T_ELLIPSIS,
+								Value: []byte("..."),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  198,
+									EndPos:    201,
+								},
+							},
+							Var: &ast.ExprVariable{
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  201,
+									EndPos:    205,
+								},
+								VarName: &ast.Identifier{
+									Position: &position.Position{
+										StartLine: 5,
+										EndLine:   5,
+										StartPos:  201,
+										EndPos:    205,
+									},
+									IdentifierTkn: &token.Token{
+										ID:    token.T_VARIABLE,
+										Value: []byte("$baz"),
+										Position: &position.Position{
+											StartLine: 5,
+											EndLine:   5,
+											StartPos:  201,
 											EndPos:    205,
 										},
 									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 5,
-												EndLine:   5,
-												StartPos:  201,
-												EndPos:    205,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 5,
-													EndLine:   5,
-													StartPos:  201,
-													EndPos:    205,
-												},
-											},
-											Value: []byte("$baz"),
-										},
-									},
+									Value: []byte("$baz"),
+								},
+							},
+						},
+					},
+					SeparatorTkns: []*token.Token{
+						{
+							ID:    token.ID(44),
+							Value: []byte(","),
+							Position: &position.Position{
+								StartLine: 5,
+								EndLine:   5,
+								StartPos:  191,
+								EndPos:    192,
+							},
+						},
+					},
+					CloseParenthesisTkn: &token.Token{
+						ID:    token.ID(41),
+						Value: []byte(")"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  205,
+							EndPos:    206,
+						},
+					},
+					OpenCurlyBracketTkn: &token.Token{
+						ID:    token.ID(123),
+						Value: []byte("{"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  207,
+							EndPos:    208,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 5,
+									EndLine:   5,
+									StartPos:  206,
+									EndPos:    207,
 								},
 							},
 						},
 					},
 					Stmts: []ast.Vertex{},
+					CloseCurlyBracketTkn: &token.Token{
+						ID:    token.ID(125),
+						Value: []byte("}"),
+						Position: &position.Position{
+							StartLine: 5,
+							EndLine:   5,
+							StartPos:  208,
+							EndPos:    209,
+						},
+					},
+				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 5,
+						EndLine:   5,
+						StartPos:  209,
+						EndPos:    210,
+					},
+				},
+			},
+		},
+		EndTkn: &token.Token{},
+	}
+
+	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
+	php5parser := php5.NewParser(lexer, nil)
+	php5parser.Parse()
+	actual := php5parser.GetRootNode()
+	assert.DeepEqual(t, expected, actual)
+}
+
+func TestCommentEndFile(t *testing.T) {
+	src := `<? //comment at the end)`
+
+	expected := &ast.Root{
+		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,
+					},
 				},
 			},
 		},
@@ -1664,32 +3044,6 @@ func TestPhp5ParameterNode(t *testing.T) {
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-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,
-			},
-		},
-		Stmts: []ast.Vertex{},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -1699,77 +3053,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -1777,45 +3172,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,
@@ -1827,27 +3254,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -1855,45 +3301,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,
@@ -1905,27 +3393,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -1935,36 +3442,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,
@@ -1975,16 +3516,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,
@@ -1996,17 +3543,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2014,36 +3580,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,
@@ -2054,16 +3654,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,
@@ -2075,17 +3681,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2093,36 +3718,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,
@@ -2133,16 +3792,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,
@@ -2154,7 +3819,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,
@@ -2165,17 +3838,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2183,36 +3875,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,
@@ -2223,16 +3949,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,
@@ -2243,39 +3975,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2283,36 +4068,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,
@@ -2323,25 +4142,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,
@@ -2352,8 +4175,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,
@@ -2365,7 +4206,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,
@@ -2376,17 +4225,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2394,36 +4262,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,
@@ -2433,105 +4335,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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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,
@@ -2542,67 +4379,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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,
@@ -2612,70 +4501,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), "5.6", nil)
+	php5parser := php5.NewParser(lexer, nil)
+	php5parser.Parse()
+	actual := php5parser.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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2686,37 +4867,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,
@@ -2727,16 +4941,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,
@@ -2748,7 +4968,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,
@@ -2759,6 +4987,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,
+					},
 				},
 			},
 		},
@@ -2768,8 +5030,6 @@ LBL;
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2780,37 +5040,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,
@@ -2821,16 +5114,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,
@@ -2842,7 +5141,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,
@@ -2853,6 +5160,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,
+					},
 				},
 			},
 		},
@@ -2862,8 +5203,6 @@ LBL;
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2874,37 +5213,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,
@@ -2915,6 +5287,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,
+					},
 				},
 			},
 		},
@@ -2924,8 +5330,6 @@ LBL;
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2935,34 +5339,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("CAD"),
+						Position: &position.Position{
+							StartLine: 2,
+							EndLine:   2,
+							StartPos:  10,
 							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,
+					},
 				},
 			},
 		},
@@ -2972,8 +5435,6 @@ CAD;
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -2984,37 +5445,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,
@@ -3025,6 +5519,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,
+					},
 				},
 			},
 		},
@@ -3034,8 +5562,6 @@ CAD;
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3044,45 +5570,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3090,45 +5651,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3136,45 +5732,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3182,45 +5813,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3228,45 +5894,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3274,45 +5975,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3320,45 +6056,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3366,45 +6137,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3412,45 +6218,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3458,45 +6299,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3506,45 +6382,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3552,45 +6463,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3600,45 +6546,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3647,40 +6628,94 @@ func TestScalarString_MultilineSingleQuotedScalarString(t *testing.T) {
 func TestStmtAltIf_AltIf(t *testing.T) {
 	src := `<?
 		if ($a) :
-		endif;
-	`
+		endif;`
 
 	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,
@@ -3691,27 +6726,88 @@ 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{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3723,36 +6819,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,
@@ -3763,39 +6914,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,
@@ -3806,19 +7034,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,
+					},
+				},
 			},
 		},
 	}
@@ -3827,8 +7119,6 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3840,36 +7130,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,
@@ -3880,37 +7225,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,
 					},
 				},
 			},
@@ -3921,8 +7369,6 @@ func TestStmtAltIf_AltElse(t *testing.T) {
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -3936,36 +7382,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,
@@ -3976,39 +7477,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,
@@ -4019,39 +7597,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,
@@ -4062,41 +7705,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,
+					},
+				},
 			},
 		},
 	}
@@ -4105,8 +7839,6 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4114,123 +7846,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4238,80 +8211,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4319,150 +8460,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4470,48 +8928,219 @@ func TestStmtClassMethod_Php5ClassMethod(t *testing.T) {
 	src := `<? class foo{ public static function &bar() {} }`
 
 	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:  12,
+						EndPos:    13,
+					},
+				},
 				Stmts: []ast.Vertex{
 					&ast.StmtClassMethod{
-						Node: ast.Node{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    46,
+						},
+						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:    46,
+								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,
@@ -4521,53 +9150,100 @@ func TestStmtClassMethod_Php5ClassMethod(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,
 							},
 						},
 						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  44,
+								EndPos:    46,
+							},
+							OpenCurlyBracketTkn: &token.Token{
+								ID:    token.ID(123),
+								Value: []byte("{"),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  44,
-									EndPos:    46,
+									EndPos:    45,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  43,
+											EndPos:    44,
+										},
+									},
 								},
 							},
 							Stmts: []ast.Vertex{},
+							CloseCurlyBracketTkn: &token.Token{
+								ID:    token.ID(125),
+								Value: []byte("}"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  45,
+									EndPos:    46,
+								},
+							},
+						},
+					},
+				},
+				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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4575,96 +9251,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,
@@ -4675,16 +9536,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4692,46 +9574,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4739,59 +9700,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4799,92 +9859,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4892,76 +10101,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"),
 								},
@@ -4969,17 +10284,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -4987,117 +10345,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5105,100 +10642,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5206,26 +10912,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,
@@ -5235,38 +10999,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5274,26 +11119,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,
@@ -5303,49 +11206,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5353,26 +11357,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,
@@ -5382,49 +11444,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5432,36 +11611,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,
@@ -5471,8 +11694,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,
@@ -5484,8 +11725,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,
@@ -5496,14 +11755,13 @@ func TestStmtDeclare(t *testing.T) {
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5511,36 +11769,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,
@@ -5550,8 +11852,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,
@@ -5563,27 +11883,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,
@@ -5595,27 +11951,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5623,36 +12030,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,
@@ -5662,8 +12113,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,
@@ -5675,28 +12144,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5704,37 +12221,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,
@@ -5744,16 +12359,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5761,68 +12395,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5830,57 +12551,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5888,45 +12680,136 @@ func TestStmtExpression(t *testing.T) {
 	src := `<? ((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.ParserBrackets{
 					Position: &position.Position{
 						StartLine: 1,
 						EndLine:   1,
 						StartPos:  3,
-						EndPos:    9,
+						EndPos:    8,
 					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
+					OpenBracketTkn: &token.Token{
+						ID:    token.ID(40),
+						Value: []byte("("),
 						Position: &position.Position{
 							StartLine: 1,
 							EndLine:   1,
-							StartPos:  5,
-							EndPos:    6,
+							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"),
+					Child: &ast.ParserBrackets{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  4,
+							EndPos:    7,
+						},
+						OpenBracketTkn: &token.Token{
+							ID:    token.ID(40),
+							Value: []byte("("),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  4,
+								EndPos:    5,
+							},
+						},
+						Child: &ast.ScalarLnumber{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  5,
+								EndPos:    6,
+							},
+							NumberTkn: &token.Token{
+								ID:    token.T_LNUMBER,
+								Value: []byte("1"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  5,
+									EndPos:    6,
+								},
+							},
+							Value: []byte("1"),
+						},
+						CloseBracketTkn: &token.Token{
+							ID:    token.ID(41),
+							Value: []byte(")"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  6,
+								EndPos:    7,
+							},
+						},
+					},
+					CloseBracketTkn: &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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -5934,45 +12817,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,
@@ -5983,148 +12908,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6132,123 +13280,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6256,35 +13606,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,
@@ -6295,48 +13701,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6344,77 +13829,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6422,36 +14053,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,
@@ -6462,48 +14148,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6511,35 +14298,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,
@@ -6550,69 +14393,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6620,98 +14582,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6719,35 +14867,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,
@@ -6758,47 +14962,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,
@@ -6810,27 +15102,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6838,35 +15169,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,
@@ -6877,57 +15264,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,
@@ -6940,28 +15423,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -6969,47 +15501,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7017,58 +15647,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7076,48 +15822,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,
@@ -7128,113 +15937,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7242,27 +16194,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,
@@ -7272,39 +16281,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7312,57 +16410,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7370,87 +16523,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,
@@ -7463,69 +16706,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7533,66 +16879,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:  6,
+						EndPos:    10,
+					},
+					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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7600,34 +17031,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7635,35 +17123,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,
@@ -7674,27 +17218,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7702,35 +17285,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,
@@ -7741,38 +17380,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,
@@ -7783,29 +17510,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7813,35 +17579,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,
@@ -7852,48 +17674,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -7901,35 +17812,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,
@@ -7940,38 +17907,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,
@@ -7982,38 +18037,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,
@@ -8024,50 +18167,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8075,35 +18307,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,
@@ -8114,38 +18402,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,
@@ -8156,48 +18532,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,
@@ -8208,50 +18692,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8259,27 +18832,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,
@@ -8290,14 +18899,13 @@ func TestStmtInlineHtml(t *testing.T) {
 				Value: []byte(" <div></div>"),
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8305,46 +18913,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8352,63 +19039,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"),
 								},
@@ -8416,17 +19189,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8434,104 +19238,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8539,57 +19490,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8597,58 +19603,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8656,35 +19739,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8692,48 +19834,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,
@@ -8746,49 +19964,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8796,48 +20049,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,
@@ -8848,104 +20177,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -8953,48 +20407,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,
@@ -9005,104 +20535,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9110,67 +20765,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9178,109 +20886,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9288,178 +21119,869 @@ 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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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;
-		}
-	`
+		}`
 
 	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:  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{
+							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.StmtBreak{
+								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:  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{
+						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:  39,
+								EndPos:    43,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   4,
+										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{},
+	}
+
+	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
+	php5parser := php5.NewParser(lexer, nil)
+	php5parser.Parse()
+	actual := php5parser.GetRootNode()
+	assert.DeepEqual(t, expected, actual)
+}
+
+func TestStmtSwitch_Semicolon(t *testing.T) {
+	src := `<?
+		switch (1) {;
+			case 1; break;
+			case 2; break;
+		}`
+
+	expected := &ast.Root{
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   5,
+			StartPos:  5,
+			EndPos:    58,
+		},
+		Stmts: []ast.Vertex{
+			&ast.StmtSwitch{
+				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:   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,
+					},
+				},
+				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{
+						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:  22,
-								EndPos:    36,
+								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:  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:  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,
 									},
 								},
@@ -9467,32 +21989,112 @@ func TestStmtSwitch(t *testing.T) {
 						},
 					},
 					&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:  40,
-								EndPos:    54,
+								EndPos:    44,
+							},
+							FreeFloating: []*token.Token{
+								{
+									ID:    token.T_WHITESPACE,
+									Value: []byte("\n\t\t\t"),
+									Position: &position.Position{
+										StartLine: 3,
+										EndLine:   4,
+										StartPos:  36,
+										EndPos:    40,
+									},
+								},
 							},
 						},
 						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
+							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{
-								Node: ast.Node{
+								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,
 									},
 								},
@@ -9500,343 +22102,723 @@ func TestStmtSwitch(t *testing.T) {
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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 := `<? 
-		switch (1) {;
-			case 1; break;
-			case 2; break;
-		}
-	`
-
-	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 2,
-				EndLine:   5,
-				StartPos:  6,
-				EndPos:    59,
-			},
-		},
-		Stmts: []ast.Vertex{
-			&ast.StmtSwitch{
-				Node: ast.Node{
+				CloseCurlyBracketTkn: &token.Token{
+					ID:    token.ID(125),
+					Value: []byte("}"),
 					Position: &position.Position{
-						StartLine: 2,
+						StartLine: 5,
 						EndLine:   5,
-						StartPos:  6,
-						EndPos:    59,
+						StartPos:  57,
+						EndPos:    58,
 					},
-				},
-				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{
-							Position: &position.Position{
-								StartLine: 3,
-								EndLine:   3,
-								StartPos:  23,
-								EndPos:    37,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 3,
-									EndLine:   3,
-									StartPos:  28,
-									EndPos:    29,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 3,
-										EndLine:   3,
-										StartPos:  31,
-										EndPos:    37,
-									},
-								},
-							},
-						},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
+					FreeFloating: []*token.Token{
+						{
+							ID:    token.T_WHITESPACE,
+							Value: []byte("\n\t\t"),
 							Position: &position.Position{
 								StartLine: 4,
-								EndLine:   4,
-								StartPos:  41,
-								EndPos:    55,
-							},
-						},
-						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{
-									Position: &position.Position{
-										StartLine: 4,
-										EndLine:   4,
-										StartPos:  49,
-										EndPos:    55,
-									},
-								},
+								EndLine:   5,
+								StartPos:  54,
+								EndPos:    57,
 							},
 						},
 					},
 				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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:
 			case 2;
-		endswitch;
-	`
+		endswitch;`
 
 	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{},
+	}
+
+	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
+	php5parser := php5.NewParser(lexer, nil)
+	php5parser.Parse()
+	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9844,55 +22826,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9900,46 +22937,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -9947,72 +23063,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,
@@ -10023,16 +23255,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10040,95 +23293,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,
@@ -10139,16 +23538,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10156,115 +23576,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10272,159 +23881,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10432,170 +24310,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -10603,146 +24770,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,
@@ -10753,98 +25110,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,
@@ -10855,127 +25324,387 @@ 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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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 := `<? 
-		try {}
-	`
+	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{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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 := `<? 
-		try {} catch (Exception $e) {}
-	`
+	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"),
@@ -10984,95 +25713,261 @@ 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{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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 := `<? 
-		try {} catch (Exception $e) {} catch (RuntimeException $e) {}
-	`
+	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"),
@@ -11081,55 +25976,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"),
@@ -11138,95 +26141,261 @@ 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{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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 := `<? 
-		try {} catch (Exception $e) {} finally {}
-	`
+	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"),
@@ -11235,50 +26404,161 @@ 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{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11286,48 +26566,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,
@@ -11341,50 +26729,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,
@@ -11398,50 +26904,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,
@@ -11455,39 +27089,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11495,36 +27188,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,
@@ -11536,16 +27273,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11553,36 +27309,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,
@@ -11594,37 +27394,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11632,52 +27481,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"),
 								},
@@ -11685,16 +27578,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11702,46 +27604,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,
@@ -11755,16 +27711,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11772,46 +27737,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,
@@ -11823,29 +27842,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11853,52 +27923,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"),
 								},
@@ -11906,32 +28020,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"),
 								},
@@ -11939,16 +28069,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -11956,52 +28107,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"),
 								},
@@ -12009,60 +28204,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12070,63 +28344,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"),
 								},
@@ -12134,26 +28472,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,
@@ -12167,16 +28531,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12184,101 +28569,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,
@@ -12290,29 +28807,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12320,63 +28900,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"),
 								},
@@ -12384,26 +29028,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,
@@ -12417,16 +29087,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12434,101 +29125,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,
@@ -12540,29 +29363,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12570,26 +29456,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,
@@ -12599,38 +29543,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12638,26 +29663,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,
@@ -12667,49 +29750,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12717,27 +29901,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,
@@ -12747,49 +29988,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12799,56 +30167,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,
@@ -12858,17 +30266,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12876,65 +30303,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,
@@ -12944,9 +30409,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,
@@ -12956,17 +30449,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -12974,45 +30486,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13020,45 +30586,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,
@@ -13070,17 +30678,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13088,45 +30715,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,
@@ -13136,8 +30805,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,
@@ -13149,34 +30836,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,
@@ -13191,17 +30902,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13209,44 +30961,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,
@@ -13258,16 +31042,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13275,44 +31068,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,
@@ -13324,16 +31149,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13341,58 +31175,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,
@@ -13403,16 +31277,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13420,46 +31303,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,
@@ -13470,16 +31395,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13487,65 +31421,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13553,65 +31556,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13619,47 +31675,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13667,56 +31796,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,
@@ -13729,58 +31896,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,
@@ -13792,25 +32045,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,
@@ -13823,19 +32102,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -13843,56 +32185,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,
@@ -13905,67 +32285,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,
@@ -13978,40 +32452,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14019,67 +32574,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14087,45 +32673,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,
@@ -14138,16 +32766,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14155,45 +32792,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,
@@ -14206,16 +32875,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14223,44 +32901,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,
@@ -14271,17 +32991,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14289,44 +33028,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,
@@ -14338,16 +33109,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14355,44 +33135,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,
@@ -14403,17 +33225,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14421,45 +33262,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14467,45 +33342,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14513,45 +33442,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,
@@ -14562,17 +33532,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14580,45 +33569,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14626,45 +33649,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14672,45 +33749,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,
@@ -14721,17 +33839,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14739,77 +33876,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14817,45 +33995,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,
@@ -14867,27 +34087,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14895,45 +34134,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,
@@ -14945,52 +34216,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -14998,120 +34301,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15119,88 +34485,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,
@@ -15208,44 +34606,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15253,65 +34678,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15319,65 +34785,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15385,44 +34892,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,
@@ -15434,16 +34973,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15451,44 +34999,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,
@@ -15500,16 +35080,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15517,65 +35106,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15583,65 +35225,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15649,65 +35344,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15715,65 +35463,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15781,88 +35582,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15870,66 +35742,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,
@@ -15942,16 +35896,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -15959,66 +35922,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,
@@ -16031,16 +36066,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16048,45 +36092,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,
@@ -16098,17 +36184,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16116,45 +36221,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,
@@ -16166,38 +36313,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16205,76 +36401,171 @@ 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,
+							},
+						},
+						Items: []ast.Vertex{
+							&ast.ExprArrayItem{},
+						},
+						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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16282,63 +36573,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,
@@ -16351,39 +36680,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16391,72 +36779,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,
@@ -16467,42 +36891,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16510,82 +37013,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,
@@ -16598,42 +37155,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16641,109 +37267,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16751,71 +37498,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"),
 									},
@@ -16823,39 +37620,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16863,56 +37775,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,
@@ -16922,27 +37874,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -16950,67 +37921,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17018,45 +38042,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,
@@ -17068,27 +38156,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17096,45 +38203,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,
@@ -17146,27 +38307,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17174,65 +38354,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17242,56 +38491,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,
@@ -17302,16 +38591,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17320,35 +38618,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,
@@ -17359,47 +38713,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,
@@ -17411,27 +38853,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17439,36 +38920,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,
@@ -17479,16 +38994,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,
@@ -17500,17 +39021,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17518,45 +39058,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17564,45 +39148,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,
@@ -17614,17 +39230,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17632,45 +39267,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,
@@ -17680,8 +39347,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,
@@ -17693,34 +39378,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,
@@ -17735,17 +39444,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17753,58 +39503,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,
@@ -17814,27 +39604,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17842,45 +39651,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,
@@ -17892,8 +39743,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,
@@ -17903,27 +39772,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -17931,45 +39819,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,
@@ -17981,8 +39901,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,
@@ -17992,27 +39930,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18020,67 +39977,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,
@@ -18091,27 +40086,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18119,65 +40133,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,
@@ -18188,27 +40240,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18216,67 +40287,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,
@@ -18288,16 +40397,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18305,45 +40423,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,
@@ -18355,17 +40515,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,
@@ -18377,16 +40553,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18394,45 +40579,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,
@@ -18444,17 +40661,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,
@@ -18466,16 +40699,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18483,107 +40725,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18591,86 +40944,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18678,159 +41124,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18838,159 +41473,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -18998,44 +41822,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,
@@ -19047,16 +41903,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19064,44 +41929,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,
@@ -19113,16 +42010,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19130,55 +42036,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19186,44 +42125,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,
@@ -19235,16 +42206,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19252,44 +42232,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19297,65 +42312,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19363,86 +42431,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19450,55 +42611,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -19506,3832 +42722,5690 @@ 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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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;`
+func TestExprAssign(t *testing.T) {
+	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;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   17,
+			StartPos:  5,
+			EndPos:    210,
 		},
 		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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 17,
+						EndLine:   17,
+						StartPos:  209,
+						EndPos:    210,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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 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;`
 
 	expected := &ast.Root{
-		Node: ast.Node{
-			Position: &position.Position{
-				StartLine: 1,
-				EndLine:   1,
-				StartPos:  3,
-				EndPos:    11,
-			},
+		Position: &position.Position{
+			StartLine: 2,
+			EndLine:   26,
+			StartPos:  5,
+			EndPos:    295,
 		},
 		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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 6,
+						EndLine:   6,
+						StartPos:  58,
+						EndPos:    59,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 7,
+					EndLine:   7,
+					StartPos:  62,
+					EndPos:    70,
+				},
 				Expr: &ast.ExprBinaryConcat{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 7,
+						EndLine:   7,
+						StartPos:  62,
+						EndPos:    69,
 					},
 					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:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(46),
+						Value: []byte("."),
+						Position: &position.Position{
+							StartLine: 7,
+							EndLine:   7,
+							StartPos:  65,
+							EndPos:    66,
+						},
+						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:  67,
+							EndPos:    69,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 7,
+								EndLine:   7,
+								StartPos:  67,
+								EndPos:    69,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 7,
+									EndLine:   7,
+									StartPos:  67,
+									EndPos:    69,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   7,
+											StartPos:  66,
+											EndPos:    67,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 7,
+						EndLine:   7,
+						StartPos:  69,
+						EndPos:    70,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 8,
+					EndLine:   8,
+					StartPos:  73,
+					EndPos:    81,
+				},
 				Expr: &ast.ExprBinaryDiv{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 8,
+						EndLine:   8,
+						StartPos:  73,
+						EndPos:    80,
 					},
 					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:  73,
+							EndPos:    75,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 8,
+								EndLine:   8,
+								StartPos:  73,
+								EndPos:    75,
+							},
+							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:  73,
+									EndPos:    75,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 7,
+											EndLine:   8,
+											StartPos:  70,
+											EndPos:    73,
+										},
+									},
 								},
 							},
 							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: 8,
+							EndLine:   8,
+							StartPos:  76,
+							EndPos:    77,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 8,
+									EndLine:   8,
+									StartPos:  75,
+									EndPos:    76,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 8,
+							EndLine:   8,
+							StartPos:  78,
+							EndPos:    80,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 8,
+								EndLine:   8,
+								StartPos:  78,
+								EndPos:    80,
+							},
+							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:  78,
+									EndPos:    80,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 8,
+											EndLine:   8,
+											StartPos:  77,
+											EndPos:    78,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 8,
+						EndLine:   8,
+						StartPos:  80,
+						EndPos:    81,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 9,
+					EndLine:   9,
+					StartPos:  84,
+					EndPos:    93,
+				},
 				Expr: &ast.ExprBinaryEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 9,
+						EndLine:   9,
+						StartPos:  84,
+						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:  84,
+							EndPos:    86,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 9,
+								EndLine:   9,
+								StartPos:  84,
+								EndPos:    86,
+							},
+							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:  84,
+									EndPos:    86,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 8,
+											EndLine:   9,
+											StartPos:  81,
+											EndPos:    84,
+										},
+									},
 								},
 							},
 							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: 9,
+							EndLine:   9,
+							StartPos:  87,
+							EndPos:    89,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 9,
+									EndLine:   9,
+									StartPos:  86,
+									EndPos:    87,
+								},
 							},
 						},
+					},
+					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:  9,
-									EndPos:    11,
+									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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 9,
+						EndLine:   9,
+						StartPos:  92,
+						EndPos:    93,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 10,
+					EndLine:   10,
+					StartPos:  96,
+					EndPos:    105,
+				},
 				Expr: &ast.ExprBinaryGreaterOrEqual{
-					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_GREATER_OR_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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 10,
+						EndLine:   10,
+						StartPos:  104,
+						EndPos:    105,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 11,
+					EndLine:   11,
+					StartPos:  108,
+					EndPos:    116,
+				},
 				Expr: &ast.ExprBinaryGreater{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 11,
+						EndLine:   11,
+						StartPos:  108,
+						EndPos:    115,
 					},
 					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:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(62),
+						Value: []byte(">"),
+						Position: &position.Position{
+							StartLine: 11,
+							EndLine:   11,
+							StartPos:  111,
+							EndPos:    112,
+						},
+						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:  113,
+							EndPos:    115,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 11,
+								EndLine:   11,
+								StartPos:  113,
+								EndPos:    115,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 11,
+									EndLine:   11,
+									StartPos:  113,
+									EndPos:    115,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 11,
+											EndLine:   11,
+											StartPos:  112,
+											EndPos:    113,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 11,
+						EndLine:   11,
+						StartPos:  115,
+						EndPos:    116,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 12,
+					EndLine:   12,
+					StartPos:  119,
+					EndPos:    129,
+				},
 				Expr: &ast.ExprBinaryIdentical{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 12,
+						EndLine:   12,
+						StartPos:  119,
+						EndPos:    128,
 					},
 					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:  119,
+							EndPos:    121,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 12,
+								EndLine:   12,
+								StartPos:  119,
+								EndPos:    121,
+							},
+							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:  119,
+									EndPos:    121,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 11,
+											EndLine:   12,
+											StartPos:  116,
+											EndPos:    119,
+										},
+									},
 								},
 							},
 							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: 12,
+							EndLine:   12,
+							StartPos:  122,
+							EndPos:    125,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  121,
+									EndPos:    122,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 12,
+							EndLine:   12,
+							StartPos:  126,
+							EndPos:    128,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 12,
+								EndLine:   12,
+								StartPos:  126,
+								EndPos:    128,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 12,
+									EndLine:   12,
+									StartPos:  126,
+									EndPos:    128,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 12,
+											EndLine:   12,
+											StartPos:  125,
+											EndPos:    126,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 12,
+						EndLine:   12,
+						StartPos:  128,
+						EndPos:    129,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 13,
+					EndLine:   13,
+					StartPos:  132,
+					EndPos:    142,
+				},
 				Expr: &ast.ExprBinaryLogicalAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 13,
+						EndLine:   13,
+						StartPos:  132,
+						EndPos:    141,
 					},
 					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:  132,
+							EndPos:    134,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 13,
+								EndLine:   13,
+								StartPos:  132,
+								EndPos:    134,
+							},
+							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:  132,
+									EndPos:    134,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 12,
+											EndLine:   13,
+											StartPos:  129,
+											EndPos:    132,
+										},
+									},
 								},
 							},
 							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: 13,
+							EndLine:   13,
+							StartPos:  135,
+							EndPos:    138,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 13,
+									EndLine:   13,
+									StartPos:  134,
+									EndPos:    135,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 13,
+							EndLine:   13,
+							StartPos:  139,
+							EndPos:    141,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 13,
+								EndLine:   13,
+								StartPos:  139,
+								EndPos:    141,
+							},
+							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:  139,
+									EndPos:    141,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 13,
+											EndLine:   13,
+											StartPos:  138,
+											EndPos:    139,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 13,
+						EndLine:   13,
+						StartPos:  141,
+						EndPos:    142,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 14,
+					EndLine:   14,
+					StartPos:  145,
+					EndPos:    154,
+				},
 				Expr: &ast.ExprBinaryLogicalOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 14,
+						EndLine:   14,
+						StartPos:  145,
+						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:  145,
+							EndPos:    147,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 14,
+								EndLine:   14,
+								StartPos:  145,
+								EndPos:    147,
+							},
+							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:  145,
+									EndPos:    147,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 13,
+											EndLine:   14,
+											StartPos:  142,
+											EndPos:    145,
+										},
+									},
 								},
 							},
 							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: 14,
+							EndLine:   14,
+							StartPos:  148,
+							EndPos:    150,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 14,
+									EndLine:   14,
+									StartPos:  147,
+									EndPos:    148,
+								},
 							},
 						},
+					},
+					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:  9,
-									EndPos:    11,
+									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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 14,
+						EndLine:   14,
+						StartPos:  153,
+						EndPos:    154,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 15,
+					EndLine:   15,
+					StartPos:  157,
+					EndPos:    167,
+				},
 				Expr: &ast.ExprBinaryLogicalXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 15,
+						EndLine:   15,
+						StartPos:  157,
+						EndPos:    166,
 					},
 					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:  10,
-								EndPos:    12,
+					OpTkn: &token.Token{
+						ID:    token.T_LOGICAL_XOR,
+						Value: []byte("xor"),
+						Position: &position.Position{
+							StartLine: 15,
+							EndLine:   15,
+							StartPos:  160,
+							EndPos:    163,
+						},
+						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:  164,
+							EndPos:    166,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 15,
+								EndLine:   15,
+								StartPos:  164,
+								EndPos:    166,
+							},
+							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:  164,
+									EndPos:    166,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 15,
+											EndLine:   15,
+											StartPos:  163,
+											EndPos:    164,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 15,
+						EndLine:   15,
+						StartPos:  166,
+						EndPos:    167,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 16,
+					EndLine:   16,
+					StartPos:  170,
+					EndPos:    178,
+				},
 				Expr: &ast.ExprBinaryMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 16,
+						EndLine:   16,
+						StartPos:  170,
+						EndPos:    177,
 					},
 					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:  170,
+							EndPos:    172,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 16,
+								EndLine:   16,
+								StartPos:  170,
+								EndPos:    172,
+							},
+							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:  170,
+									EndPos:    172,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 15,
+											EndLine:   16,
+											StartPos:  167,
+											EndPos:    170,
+										},
+									},
 								},
 							},
 							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: 16,
+							EndLine:   16,
+							StartPos:  173,
+							EndPos:    174,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 16,
+									EndLine:   16,
+									StartPos:  172,
+									EndPos:    173,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 16,
+							EndLine:   16,
+							StartPos:  175,
+							EndPos:    177,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 16,
+								EndLine:   16,
+								StartPos:  175,
+								EndPos:    177,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 16,
+									EndLine:   16,
+									StartPos:  175,
+									EndPos:    177,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 16,
+											EndLine:   16,
+											StartPos:  174,
+											EndPos:    175,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 16,
+						EndLine:   16,
+						StartPos:  177,
+						EndPos:    178,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 17,
+					EndLine:   17,
+					StartPos:  181,
+					EndPos:    189,
+				},
 				Expr: &ast.ExprBinaryMod{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 17,
+						EndLine:   17,
+						StartPos:  181,
+						EndPos:    188,
 					},
 					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:  181,
+							EndPos:    183,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 17,
+								EndLine:   17,
+								StartPos:  181,
+								EndPos:    183,
+							},
+							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:  181,
+									EndPos:    183,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 16,
+											EndLine:   17,
+											StartPos:  178,
+											EndPos:    181,
+										},
+									},
 								},
 							},
 							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: 17,
+							EndLine:   17,
+							StartPos:  184,
+							EndPos:    185,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 17,
+									EndLine:   17,
+									StartPos:  183,
+									EndPos:    184,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 17,
+							EndLine:   17,
+							StartPos:  186,
+							EndPos:    188,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 17,
+								EndLine:   17,
+								StartPos:  186,
+								EndPos:    188,
+							},
+							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:  186,
+									EndPos:    188,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 17,
+											EndLine:   17,
+											StartPos:  185,
+											EndPos:    186,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 17,
+						EndLine:   17,
+						StartPos:  188,
+						EndPos:    189,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 18,
+					EndLine:   18,
+					StartPos:  192,
+					EndPos:    200,
+				},
 				Expr: &ast.ExprBinaryMul{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 18,
+						EndLine:   18,
+						StartPos:  192,
+						EndPos:    199,
 					},
 					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:  192,
+							EndPos:    194,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 18,
+								EndLine:   18,
+								StartPos:  192,
+								EndPos:    194,
+							},
+							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:  192,
+									EndPos:    194,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 17,
+											EndLine:   18,
+											StartPos:  189,
+											EndPos:    192,
+										},
+									},
 								},
 							},
 							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: 18,
+							EndLine:   18,
+							StartPos:  195,
+							EndPos:    196,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 18,
+									EndLine:   18,
+									StartPos:  194,
+									EndPos:    195,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 18,
+							EndLine:   18,
+							StartPos:  197,
+							EndPos:    199,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 18,
+								EndLine:   18,
+								StartPos:  197,
+								EndPos:    199,
+							},
+							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:  197,
+									EndPos:    199,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 18,
+											EndLine:   18,
+											StartPos:  196,
+											EndPos:    197,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 18,
+						EndLine:   18,
+						StartPos:  199,
+						EndPos:    200,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 19,
+					EndLine:   19,
+					StartPos:  203,
+					EndPos:    212,
+				},
 				Expr: &ast.ExprBinaryNotEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 19,
+						EndLine:   19,
+						StartPos:  203,
+						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:  203,
+							EndPos:    205,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 19,
+								EndLine:   19,
+								StartPos:  203,
+								EndPos:    205,
+							},
+							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:  203,
+									EndPos:    205,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 18,
+											EndLine:   19,
+											StartPos:  200,
+											EndPos:    203,
+										},
+									},
 								},
 							},
 							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: 19,
+							EndLine:   19,
+							StartPos:  206,
+							EndPos:    208,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 19,
+									EndLine:   19,
+									StartPos:  205,
+									EndPos:    206,
+								},
 							},
 						},
+					},
+					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:  9,
-									EndPos:    11,
+									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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 19,
+						EndLine:   19,
+						StartPos:  211,
+						EndPos:    212,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 20,
+					EndLine:   20,
+					StartPos:  215,
+					EndPos:    225,
+				},
 				Expr: &ast.ExprBinaryNotIdentical{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    12,
-						},
+					Position: &position.Position{
+						StartLine: 20,
+						EndLine:   20,
+						StartPos:  215,
+						EndPos:    224,
 					},
 					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:  10,
-								EndPos:    12,
+					OpTkn: &token.Token{
+						ID:    token.T_IS_NOT_IDENTICAL,
+						Value: []byte("!=="),
+						Position: &position.Position{
+							StartLine: 20,
+							EndLine:   20,
+							StartPos:  218,
+							EndPos:    221,
+						},
+						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:  222,
+							EndPos:    224,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 20,
+								EndLine:   20,
+								StartPos:  222,
+								EndPos:    224,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  10,
-									EndPos:    12,
+									StartLine: 20,
+									EndLine:   20,
+									StartPos:  222,
+									EndPos:    224,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 20,
+											EndLine:   20,
+											StartPos:  221,
+											EndPos:    222,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 20,
+						EndLine:   20,
+						StartPos:  224,
+						EndPos:    225,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 21,
+					EndLine:   21,
+					StartPos:  228,
+					EndPos:    236,
+				},
 				Expr: &ast.ExprBinaryPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 21,
+						EndLine:   21,
+						StartPos:  228,
+						EndPos:    235,
 					},
 					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:  228,
+							EndPos:    230,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 21,
+								EndLine:   21,
+								StartPos:  228,
+								EndPos:    230,
+							},
+							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:  228,
+									EndPos:    230,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 20,
+											EndLine:   21,
+											StartPos:  225,
+											EndPos:    228,
+										},
+									},
 								},
 							},
 							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: 21,
+							EndLine:   21,
+							StartPos:  231,
+							EndPos:    232,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 21,
+									EndLine:   21,
+									StartPos:  230,
+									EndPos:    231,
+								},
 							},
 						},
+					},
+					Right: &ast.ExprVariable{
+						Position: &position.Position{
+							StartLine: 21,
+							EndLine:   21,
+							StartPos:  233,
+							EndPos:    235,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 21,
+								EndLine:   21,
+								StartPos:  233,
+								EndPos:    235,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 21,
+									EndLine:   21,
+									StartPos:  233,
+									EndPos:    235,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 21,
+											EndLine:   21,
+											StartPos:  232,
+											EndPos:    233,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 21,
+						EndLine:   21,
+						StartPos:  235,
+						EndPos:    236,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 22,
+					EndLine:   22,
+					StartPos:  239,
+					EndPos:    248,
+				},
 				Expr: &ast.ExprBinaryPow{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    11,
-						},
+					Position: &position.Position{
+						StartLine: 22,
+						EndLine:   22,
+						StartPos:  239,
+						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:  239,
+							EndPos:    241,
 						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 22,
+								EndLine:   22,
+								StartPos:  239,
+								EndPos:    241,
+							},
+							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:  239,
+									EndPos:    241,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte("\n\t\t"),
+										Position: &position.Position{
+											StartLine: 21,
+											EndLine:   22,
+											StartPos:  236,
+											EndPos:    239,
+										},
+									},
 								},
 							},
 							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: 22,
+							EndLine:   22,
+							StartPos:  242,
+							EndPos:    244,
+						},
+						FreeFloating: []*token.Token{
+							{
+								ID:    token.T_WHITESPACE,
+								Value: []byte(" "),
+								Position: &position.Position{
+									StartLine: 22,
+									EndLine:   22,
+									StartPos:  241,
+									EndPos:    242,
+								},
 							},
 						},
+					},
+					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:  9,
-									EndPos:    11,
+									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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 22,
+						EndLine:   22,
+						StartPos:  247,
+						EndPos:    248,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 23,
+					EndLine:   23,
+					StartPos:  251,
+					EndPos:    260,
+				},
 				Expr: &ast.ExprBinaryShiftLeft{
-					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_SL,
+						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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 23,
+						EndLine:   23,
+						StartPos:  259,
+						EndPos:    260,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 24,
+					EndLine:   24,
+					StartPos:  263,
+					EndPos:    272,
+				},
 				Expr: &ast.ExprBinaryShiftRight{
-					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_SR,
+						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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 24,
+						EndLine:   24,
+						StartPos:  271,
+						EndPos:    272,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 25,
+					EndLine:   25,
+					StartPos:  275,
+					EndPos:    284,
+				},
 				Expr: &ast.ExprBinarySmallerOrEqual{
-					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_IS_SMALLER_OR_EQUAL,
+						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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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: 25,
+						EndLine:   25,
+						StartPos:  283,
+						EndPos:    284,
 					},
 				},
+			},
+			&ast.StmtExpression{
+				Position: &position.Position{
+					StartLine: 26,
+					EndLine:   26,
+					StartPos:  287,
+					EndPos:    295,
+				},
 				Expr: &ast.ExprBinarySmaller{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 1,
-							EndLine:   1,
-							StartPos:  3,
-							EndPos:    10,
-						},
+					Position: &position.Position{
+						StartLine: 26,
+						EndLine:   26,
+						StartPos:  287,
+						EndPos:    294,
 					},
 					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:  8,
-								EndPos:    10,
+					OpTkn: &token.Token{
+						ID:    token.ID(60),
+						Value: []byte("<"),
+						Position: &position.Position{
+							StartLine: 26,
+							EndLine:   26,
+							StartPos:  290,
+							EndPos:    291,
+						},
+						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:  292,
+							EndPos:    294,
+						},
 						VarName: &ast.Identifier{
-							Node: ast.Node{
+							Position: &position.Position{
+								StartLine: 26,
+								EndLine:   26,
+								StartPos:  292,
+								EndPos:    294,
+							},
+							IdentifierTkn: &token.Token{
+								ID:    token.T_VARIABLE,
+								Value: []byte("$b"),
 								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  8,
-									EndPos:    10,
+									StartLine: 26,
+									EndLine:   26,
+									StartPos:  292,
+									EndPos:    294,
+								},
+								FreeFloating: []*token.Token{
+									{
+										ID:    token.T_WHITESPACE,
+										Value: []byte(" "),
+										Position: &position.Position{
+											StartLine: 26,
+											EndLine:   26,
+											StartPos:  291,
+											EndPos:    292,
+										},
+									},
 								},
 							},
 							Value: []byte("$b"),
 						},
 					},
 				},
+				SemiColonTkn: &token.Token{
+					ID:    token.ID(59),
+					Value: []byte(";"),
+					Position: &position.Position{
+						StartLine: 26,
+						EndLine:   26,
+						StartPos:  294,
+						EndPos:    295,
+					},
+				},
 			},
 		},
+		EndTkn: &token.Token{},
 	}
 
 	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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,
 								},
@@ -23340,71 +48414,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), "5.6", nil)
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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 TestPhp5Strings(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,
+					},
 				},
 			},
 		},
@@ -23414,525 +49483,477 @@ func TestExprCast_BoolShort(t *testing.T) {
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.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 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: 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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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("CAD"),
+						Position: &position.Position{
+							StartLine: 3,
+							EndLine:   3,
+							StartPos:  12,
+							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,
+					},
 				},
 			},
 		},
@@ -23942,7 +49963,30 @@ func TestExprCast_Unset(t *testing.T) {
 	php5parser := php5.NewParser(lexer, nil)
 	php5parser.Parse()
 	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
 	assert.DeepEqual(t, expected, actual)
 }
+
+func TestPhp5ControlCharsErrors(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), "5.6", errorHandlerFunc)
+	php5parser := php5.NewParser(lexer, errorHandlerFunc)
+	php5parser.Parse()
+	assert.DeepEqual(t, expected, parserErrors)
+}
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 0d1325e..59fe0b9 100644
Binary files a/internal/php5/php5.go and b/internal/php5/php5.go differ
diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 86ffc35..727d486 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -4744,7 +4744,7 @@ variable_properties:
 
 variable_property:
         T_OBJECT_OPERATOR object_property method_or_not
-            {println("FOOFOOFOOFOOFOOFOOFOOFOOFOO")
+            {
                 $2[0].(*ast.ExprPropertyFetch).ObjectOperatorTkn = $1
 
                 if $3 != nil {
diff --git a/internal/php5/php5_bench_test.go b/internal/php5/php5_bench_test.go
index 3cbd675..77c67cc 100644
--- a/internal/php5/php5_bench_test.go
+++ b/internal/php5/php5_bench_test.go
@@ -1,6 +1,7 @@
 package php5_test
 
 import (
+	"io/ioutil"
 	"testing"
 
 	"github.com/z7zmey/php-parser/internal/php5"
@@ -8,410 +9,10 @@ import (
 )
 
 func BenchmarkPhp5(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);
-
-		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[1234567890123456789012345678901234567890]";
-		"test $var[bar]";
-		"test $var[$bar]";
-		"$foo $bar";
-		"test $foo->bar()";
-		"test ${foo}";
-		"test ${foo[0]}";
-		"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{ const FOO = 1, BAR = 2; }
-		class foo{ function bar() {} }
-		class foo{ public static function &bar() {} }
-		class foo{ final private function bar() {} protected function baz() {} }
-		abstract class foo{ abstract public function bar(); }
-		final class foo extends bar { }
-		final class foo implements bar { }
-		final class 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, strict_types=1) {}
-		declare(ticks=1): enddeclare;
-		do {} while(1);
-		echo $a, 1;
-		echo($a);
-		for($i = 0; $i < 10; $i++, $i++) {}
-		for(; $i < 10; $i++) : endfor;
-		foreach ($a as $v) {}
-		foreach ([] as $v) {}
-		foreach ($a as $v) : endforeach;
-		foreach ($a as $k => $v) {}
-		foreach ([] as $k => $v) {}
-		foreach ($a as $k => &$v) {}
-		foreach ($a as $k => list($v)) {}
-		function foo() {}
-
-		function foo() {
-			__halt_compiler();
-			function bar() {}
-			class Baz {}
-			return $a;
-		}
-		
-		function foo(array $a, callable $b) {return;}
-		function &foo() {return 1;}
-		function &foo() {}
-		global $a, $b, $$c, ${foo()};
-		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\Bar {}
-		namespace {}
-		class foo {var $a;}
-		class foo {public static $a, $b = 1;}
-		class foo {public static $a = 1, $b;}
-		static $a, $b = 1;
-		static $a = 1, $b;
-
-		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 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 $e) {} catch (RuntimeException $e) {}
-		try {} catch (Exception $e) {} catch (\RuntimeException $e) {} catch (namespace\AdditionException $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;
-
-		$a[1];
-		$a[1][2];
-		array();
-		array(1);
-		array(1=>1, &$b,);
-		array(3 =>&$b);
-		array(&$b, 1=>1, 1, 3 =>&$b);
-		~$a;
-		!$a;
-
-		Foo::Bar;
-		clone($a);
-		clone $a;
-		function(){};
-		function($a, $b) use ($c, &$d) {};
-		function($a, $b) use (&$c, $d) {};
-		function() {};
-		foo;
-		namespace\foo;
-		\foo;
-
-		empty($a);
-		empty(Foo);
-		@$a;
-		eval($a);
-		exit;
-		exit($a);
-		die();
-		die($a);
-		foo();
-		namespace\foo(&$a);
-		\foo([]);
-		$foo(yield $a);
-
-		$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);
-		isset(Foo);
-		list() = $b;
-		list($a, $b) = $b;
-		list($a[]) = $b;
-		list(list($a)) = $b;
-
-		$a->foo();
-		new Foo;
-		new namespace\Foo();
-		new \Foo();
-		print($a);
-		$a->foo;
-		$a->foo[1];
-		$a->foo->bar->baz()->quux[0];
-		$a->foo()[1][1];
-		` + "`cmd $a`;" + `
-		` + "`cmd`;" + `
-		` + "``;" + `
-		[];
-		[1];
-		[1=>1, &$b,];
-
-		Foo::bar();
-		namespace\Foo::bar();
-		\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;
-		$$$a;
-		yield;
-		yield $a;
-		yield $a => $b;
-		yield Foo::class;
-		yield $a => Foo::class;
-		
-		(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 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 =& 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;
-
-
-		(new \Foo());
-		(new \Foo())->bar()->baz;
-		(new \Foo())[0][0];
-		(new \Foo())[0]->bar();
-
-		array([0])[0][0];
-		"foo"[0];
-		foo[0];
-		static::foo;
-
-		new $foo;
-		new $foo::$bar;
-		new $a->b[0];
-		new $a->b{$b ?: null}->$c->d[0];static $a = [1][0];
-
-		static $a = !1;
-		static $a = ~1;
-		static $a = +1;
-		static $a = -1;
-		static $a = (1);
-		static $a = 1 ?: 2;
-		static $a = 1 ? 2 : 3;
-		static $a = 1 & 2;
-		static $a = 1 | 2;
-		static $a = 1 ^ 2;
-		static $a = 1 && 2;
-		static $a = 1 || 2;
-		static $a = 1 . 2;
-		static $a = 1 / 2;
-		static $a = 1 == 2;
-		static $a = 1 >= 2;
-		static $a = 1 > 2;
-		static $a = 1 === 2;
-		static $a = 1 and 2;
-		static $a = 1 or 2;
-		static $a = 1 xor 2;
-		static $a = 1 - 2;
-		static $a = 1 % 2;
-		static $a = 1 * 2;
-		static $a = 1 != 2;
-		static $a = 1 !== 2;
-		static $a = 1 + 2;
-		static $a = 1 ** 2;
-		static $a = 1 << 2;
-		static $a = 1 >> 2;
-		static $a = 1 <= 2;
-		static $a = 1 < 2;
-		static $a = Foo::bar;
-		static $a = Foo::class;
-		static $a = __CLASS__;
-		static $a = Foo;
-		static $a = namespace\Foo;
-		static $a = \Foo;
-		static $a = array();
-		static $a = array(1 => 1, 2);
-		static $a = [1, 2 => 2][0];
-
-		if (yield 1) {}
-		Foo::$$bar;
-
-		$foo();
-		$foo()[0][0];
-		$a{$b};
-		${$a};
-		$foo::{$bar}();
-		$foo::bar;
-	`
+	src, err := ioutil.ReadFile("test.php")
+	if err != nil {
+		b.Fatal("can not read test.php: " + err.Error())
+	}
 
 	for n := 0; n < b.N; n++ {
 		lexer := scanner.NewLexer([]byte(src), "5.6", nil)
diff --git a/internal/php5/php5_test.go b/internal/php5/php5_test.go
deleted file mode 100644
index 406f860..0000000
--- a/internal/php5/php5_test.go
+++ /dev/null
@@ -1,22460 +0,0 @@
-package php5_test
-
-import (
-	"io/ioutil"
-	"testing"
-
-	"gotest.tools/assert"
-
-	"github.com/z7zmey/php-parser/internal/php5"
-	"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 TestPhp5(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:   379,
-				StartPos:  3,
-				EndPos:    6285,
-			},
-		},
-		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.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 9,
-						EndLine:   9,
-						StartPos:  122,
-						EndPos:    166,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 9,
-							EndLine:   9,
-							StartPos:  131,
-							EndPos:    134,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Params: []ast.Vertex{
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 9,
-								EndLine:   9,
-								StartPos:  135,
-								EndPos:    148,
-							},
-						},
-						Type: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 9,
-									EndLine:   9,
-									StartPos:  135,
-									EndPos:    138,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 9,
-											EndLine:   9,
-											StartPos:  135,
-											EndPos:    138,
-										},
-									},
-									Value: []byte("bar"),
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 9,
-									EndLine:   9,
-									StartPos:  139,
-									EndPos:    143,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 9,
-										EndLine:   9,
-										StartPos:  139,
-										EndPos:    143,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-						DefaultValue: &ast.ExprConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 9,
-									EndLine:   9,
-									StartPos:  144,
-									EndPos:    148,
-								},
-							},
-							Const: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 9,
-										EndLine:   9,
-										StartPos:  144,
-										EndPos:    148,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 9,
-												EndLine:   9,
-												StartPos:  144,
-												EndPos:    148,
-											},
-										},
-										Value: []byte("null"),
-									},
-								},
-							},
-						},
-					},
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 9,
-								EndLine:   9,
-								StartPos:  150,
-								EndPos:    162,
-							},
-						},
-						Type: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 9,
-									EndLine:   9,
-									StartPos:  150,
-									EndPos:    153,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 9,
-											EndLine:   9,
-											StartPos:  150,
-											EndPos:    153,
-										},
-									},
-									Value: []byte("baz"),
-								},
-							},
-						},
-						Var: &ast.Reference{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 9,
-									EndLine:   9,
-									StartPos:  154,
-									EndPos:    162,
-								},
-							},
-							Var: &ast.Variadic{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 9,
-										EndLine:   9,
-										StartPos:  155,
-										EndPos:    162,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 9,
-											EndLine:   9,
-											StartPos:  158,
-											EndPos:    162,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 9,
-												EndLine:   9,
-												StartPos:  158,
-												EndPos:    162,
-											},
-										},
-										Value: []byte("$baz"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 10,
-						EndLine:   10,
-						StartPos:  167,
-						EndPos:    230,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 10,
-							EndLine:   10,
-							StartPos:  173,
-							EndPos:    176,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 10,
-								EndLine:   10,
-								StartPos:  178,
-								EndPos:    229,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 10,
-									EndLine:   10,
-									StartPos:  194,
-									EndPos:    197,
-								},
-							},
-							Value: []byte("foo"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 10,
-										EndLine:   10,
-										StartPos:  178,
-										EndPos:    184,
-									},
-								},
-								Value: []byte("public"),
-							},
-						},
-						Params: []ast.Vertex{
-							&ast.Parameter{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 10,
-										EndLine:   10,
-										StartPos:  198,
-										EndPos:    211,
-									},
-								},
-								Type: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 10,
-											EndLine:   10,
-											StartPos:  198,
-											EndPos:    201,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 10,
-													EndLine:   10,
-													StartPos:  198,
-													EndPos:    201,
-												},
-											},
-											Value: []byte("bar"),
-										},
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 10,
-											EndLine:   10,
-											StartPos:  202,
-											EndPos:    206,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 10,
-												EndLine:   10,
-												StartPos:  202,
-												EndPos:    206,
-											},
-										},
-										Value: []byte("$bar"),
-									},
-								},
-								DefaultValue: &ast.ExprConstFetch{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 10,
-											EndLine:   10,
-											StartPos:  207,
-											EndPos:    211,
-										},
-									},
-									Const: &ast.NameName{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 10,
-												EndLine:   10,
-												StartPos:  207,
-												EndPos:    211,
-											},
-										},
-										Parts: []ast.Vertex{
-											&ast.NameNamePart{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 10,
-														EndLine:   10,
-														StartPos:  207,
-														EndPos:    211,
-													},
-												},
-												Value: []byte("null"),
-											},
-										},
-									},
-								},
-							},
-							&ast.Parameter{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 10,
-										EndLine:   10,
-										StartPos:  213,
-										EndPos:    225,
-									},
-								},
-								Type: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 10,
-											EndLine:   10,
-											StartPos:  213,
-											EndPos:    216,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 10,
-													EndLine:   10,
-													StartPos:  213,
-													EndPos:    216,
-												},
-											},
-											Value: []byte("baz"),
-										},
-									},
-								},
-								Var: &ast.Reference{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 10,
-											EndLine:   10,
-											StartPos:  217,
-											EndPos:    225,
-										},
-									},
-									Var: &ast.Variadic{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 10,
-												EndLine:   10,
-												StartPos:  218,
-												EndPos:    225,
-											},
-										},
-										Var: &ast.ExprVariable{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 10,
-													EndLine:   10,
-													StartPos:  221,
-													EndPos:    225,
-												},
-											},
-											VarName: &ast.Identifier{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 10,
-														EndLine:   10,
-														StartPos:  221,
-														EndPos:    225,
-													},
-												},
-												Value: []byte("$baz"),
-											},
-										},
-									},
-								},
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 10,
-									EndLine:   10,
-									StartPos:  227,
-									EndPos:    229,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 11,
-						EndLine:   11,
-						StartPos:  231,
-						EndPos:    272,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 11,
-							EndLine:   11,
-							StartPos:  231,
-							EndPos:    271,
-						},
-					},
-					Params: []ast.Vertex{
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 11,
-									EndLine:   11,
-									StartPos:  240,
-									EndPos:    253,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 11,
-										EndLine:   11,
-										StartPos:  240,
-										EndPos:    243,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 11,
-												EndLine:   11,
-												StartPos:  240,
-												EndPos:    243,
-											},
-										},
-										Value: []byte("bar"),
-									},
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 11,
-										EndLine:   11,
-										StartPos:  244,
-										EndPos:    248,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 11,
-											EndLine:   11,
-											StartPos:  244,
-											EndPos:    248,
-										},
-									},
-									Value: []byte("$bar"),
-								},
-							},
-							DefaultValue: &ast.ExprConstFetch{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 11,
-										EndLine:   11,
-										StartPos:  249,
-										EndPos:    253,
-									},
-								},
-								Const: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 11,
-											EndLine:   11,
-											StartPos:  249,
-											EndPos:    253,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 11,
-													EndLine:   11,
-													StartPos:  249,
-													EndPos:    253,
-												},
-											},
-											Value: []byte("null"),
-										},
-									},
-								},
-							},
-						},
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 11,
-									EndLine:   11,
-									StartPos:  255,
-									EndPos:    267,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 11,
-										EndLine:   11,
-										StartPos:  255,
-										EndPos:    258,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 11,
-												EndLine:   11,
-												StartPos:  255,
-												EndPos:    258,
-											},
-										},
-										Value: []byte("baz"),
-									},
-								},
-							},
-							Var: &ast.Reference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 11,
-										EndLine:   11,
-										StartPos:  259,
-										EndPos:    267,
-									},
-								},
-								Var: &ast.Variadic{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 11,
-											EndLine:   11,
-											StartPos:  260,
-											EndPos:    267,
-										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 11,
-												EndLine:   11,
-												StartPos:  263,
-												EndPos:    267,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 11,
-													EndLine:   11,
-													StartPos:  263,
-													EndPos:    267,
-												},
-											},
-											Value: []byte("$baz"),
-										},
-									},
-								},
-							},
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 12,
-						EndLine:   12,
-						StartPos:  273,
-						EndPos:    321,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 12,
-							EndLine:   12,
-							StartPos:  273,
-							EndPos:    320,
-						},
-					},
-					Static: true,
-					Params: []ast.Vertex{
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 12,
-									EndLine:   12,
-									StartPos:  289,
-									EndPos:    302,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 12,
-										EndLine:   12,
-										StartPos:  289,
-										EndPos:    292,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 12,
-												EndLine:   12,
-												StartPos:  289,
-												EndPos:    292,
-											},
-										},
-										Value: []byte("bar"),
-									},
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 12,
-										EndLine:   12,
-										StartPos:  293,
-										EndPos:    297,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 12,
-											EndLine:   12,
-											StartPos:  293,
-											EndPos:    297,
-										},
-									},
-									Value: []byte("$bar"),
-								},
-							},
-							DefaultValue: &ast.ExprConstFetch{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 12,
-										EndLine:   12,
-										StartPos:  298,
-										EndPos:    302,
-									},
-								},
-								Const: &ast.NameName{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 12,
-											EndLine:   12,
-											StartPos:  298,
-											EndPos:    302,
-										},
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 12,
-													EndLine:   12,
-													StartPos:  298,
-													EndPos:    302,
-												},
-											},
-											Value: []byte("null"),
-										},
-									},
-								},
-							},
-						},
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 12,
-									EndLine:   12,
-									StartPos:  304,
-									EndPos:    316,
-								},
-							},
-							Type: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 12,
-										EndLine:   12,
-										StartPos:  304,
-										EndPos:    307,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 12,
-												EndLine:   12,
-												StartPos:  304,
-												EndPos:    307,
-											},
-										},
-										Value: []byte("baz"),
-									},
-								},
-							},
-							Var: &ast.Reference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 12,
-										EndLine:   12,
-										StartPos:  308,
-										EndPos:    316,
-									},
-								},
-								Var: &ast.Variadic{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 12,
-											EndLine:   12,
-											StartPos:  309,
-											EndPos:    316,
-										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 12,
-												EndLine:   12,
-												StartPos:  312,
-												EndPos:    316,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 12,
-													EndLine:   12,
-													StartPos:  312,
-													EndPos:    316,
-												},
-											},
-											Value: []byte("$baz"),
-										},
-									},
-								},
-							},
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 14,
-						EndLine:   14,
-						StartPos:  323,
-						EndPos:    343,
-					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 14,
-							EndLine:   14,
-							StartPos:  323,
-							EndPos:    342,
-						},
-					},
-					Value: []byte("1234567890123456789"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 15,
-						EndLine:   15,
-						StartPos:  344,
-						EndPos:    365,
-					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 15,
-							EndLine:   15,
-							StartPos:  344,
-							EndPos:    364,
-						},
-					},
-					Value: []byte("12345678901234567890"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 16,
-						EndLine:   16,
-						StartPos:  366,
-						EndPos:    369,
-					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 16,
-							EndLine:   16,
-							StartPos:  366,
-							EndPos:    368,
-						},
-					},
-					Value: []byte("0."),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 17,
-						EndLine:   17,
-						StartPos:  370,
-						EndPos:    437,
-					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 17,
-							EndLine:   17,
-							StartPos:  370,
-							EndPos:    436,
-						},
-					},
-					Value: []byte("0b0111111111111111111111111111111111111111111111111111111111111111"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 18,
-						EndLine:   18,
-						StartPos:  438,
-						EndPos:    505,
-					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 18,
-							EndLine:   18,
-							StartPos:  438,
-							EndPos:    504,
-						},
-					},
-					Value: []byte("0b1111111111111111111111111111111111111111111111111111111111111111"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 19,
-						EndLine:   19,
-						StartPos:  506,
-						EndPos:    527,
-					},
-				},
-				Expr: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 19,
-							EndLine:   19,
-							StartPos:  506,
-							EndPos:    526,
-						},
-					},
-					Value: []byte("0x007111111111111111"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 20,
-						EndLine:   20,
-						StartPos:  528,
-						EndPos:    547,
-					},
-				},
-				Expr: &ast.ScalarDnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 20,
-							EndLine:   20,
-							StartPos:  528,
-							EndPos:    546,
-						},
-					},
-					Value: []byte("0x8111111111111111"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 21,
-						EndLine:   21,
-						StartPos:  548,
-						EndPos:    558,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 21,
-							EndLine:   21,
-							StartPos:  548,
-							EndPos:    557,
-						},
-					},
-					Value: []byte("__CLASS__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 22,
-						EndLine:   22,
-						StartPos:  559,
-						EndPos:    567,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 22,
-							EndLine:   22,
-							StartPos:  559,
-							EndPos:    566,
-						},
-					},
-					Value: []byte("__DIR__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 23,
-						EndLine:   23,
-						StartPos:  568,
-						EndPos:    577,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 23,
-							EndLine:   23,
-							StartPos:  568,
-							EndPos:    576,
-						},
-					},
-					Value: []byte("__FILE__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 24,
-						EndLine:   24,
-						StartPos:  578,
-						EndPos:    591,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 24,
-							EndLine:   24,
-							StartPos:  578,
-							EndPos:    590,
-						},
-					},
-					Value: []byte("__FUNCTION__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 25,
-						EndLine:   25,
-						StartPos:  592,
-						EndPos:    601,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 25,
-							EndLine:   25,
-							StartPos:  592,
-							EndPos:    600,
-						},
-					},
-					Value: []byte("__LINE__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 26,
-						EndLine:   26,
-						StartPos:  602,
-						EndPos:    616,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 26,
-							EndLine:   26,
-							StartPos:  602,
-							EndPos:    615,
-						},
-					},
-					Value: []byte("__NAMESPACE__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 27,
-						EndLine:   27,
-						StartPos:  617,
-						EndPos:    628,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 27,
-							EndLine:   27,
-							StartPos:  617,
-							EndPos:    627,
-						},
-					},
-					Value: []byte("__METHOD__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 28,
-						EndLine:   28,
-						StartPos:  629,
-						EndPos:    639,
-					},
-				},
-				Expr: &ast.ScalarMagicConstant{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 28,
-							EndLine:   28,
-							StartPos:  629,
-							EndPos:    638,
-						},
-					},
-					Value: []byte("__TRAIT__"),
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 30,
-						EndLine:   30,
-						StartPos:  641,
-						EndPos:    653,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 30,
-							EndLine:   30,
-							StartPos:  641,
-							EndPos:    652,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 30,
-									EndLine:   30,
-									StartPos:  642,
-									EndPos:    647,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 30,
-									EndLine:   30,
-									StartPos:  647,
-									EndPos:    651,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 30,
-										EndLine:   30,
-										StartPos:  647,
-										EndPos:    651,
-									},
-								},
-								Value: []byte("$var"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 31,
-						EndLine:   31,
-						StartPos:  654,
-						EndPos:    669,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 31,
-							EndLine:   31,
-							StartPos:  654,
-							EndPos:    668,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 31,
-									EndLine:   31,
-									StartPos:  655,
-									EndPos:    660,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 31,
-									EndLine:   31,
-									StartPos:  660,
-									EndPos:    667,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 31,
-										EndLine:   31,
-										StartPos:  660,
-										EndPos:    664,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 31,
-											EndLine:   31,
-											StartPos:  660,
-											EndPos:    664,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 31,
-										EndLine:   31,
-										StartPos:  665,
-										EndPos:    666,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 32,
-						EndLine:   32,
-						StartPos:  670,
-						EndPos:    724,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 32,
-							EndLine:   32,
-							StartPos:  670,
-							EndPos:    723,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 32,
-									EndLine:   32,
-									StartPos:  671,
-									EndPos:    676,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 32,
-									EndLine:   32,
-									StartPos:  676,
-									EndPos:    722,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 32,
-										EndLine:   32,
-										StartPos:  676,
-										EndPos:    680,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 32,
-											EndLine:   32,
-											StartPos:  676,
-											EndPos:    680,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ScalarString{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 32,
-										EndLine:   32,
-										StartPos:  681,
-										EndPos:    721,
-									},
-								},
-								Value: []byte("1234567890123456789012345678901234567890"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 33,
-						EndLine:   33,
-						StartPos:  725,
-						EndPos:    742,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 33,
-							EndLine:   33,
-							StartPos:  725,
-							EndPos:    741,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 33,
-									EndLine:   33,
-									StartPos:  726,
-									EndPos:    731,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 33,
-									EndLine:   33,
-									StartPos:  731,
-									EndPos:    740,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 33,
-										EndLine:   33,
-										StartPos:  731,
-										EndPos:    735,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 33,
-											EndLine:   33,
-											StartPos:  731,
-											EndPos:    735,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ScalarString{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 33,
-										EndLine:   33,
-										StartPos:  736,
-										EndPos:    739,
-									},
-								},
-								Value: []byte("bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 34,
-						EndLine:   34,
-						StartPos:  743,
-						EndPos:    761,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 34,
-							EndLine:   34,
-							StartPos:  743,
-							EndPos:    760,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 34,
-									EndLine:   34,
-									StartPos:  744,
-									EndPos:    749,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 34,
-									EndLine:   34,
-									StartPos:  749,
-									EndPos:    759,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 34,
-										EndLine:   34,
-										StartPos:  749,
-										EndPos:    753,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 34,
-											EndLine:   34,
-											StartPos:  749,
-											EndPos:    753,
-										},
-									},
-									Value: []byte("$var"),
-								},
-							},
-							Dim: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 34,
-										EndLine:   34,
-										StartPos:  754,
-										EndPos:    758,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 34,
-											EndLine:   34,
-											StartPos:  754,
-											EndPos:    758,
-										},
-									},
-									Value: []byte("$bar"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 35,
-						EndLine:   35,
-						StartPos:  762,
-						EndPos:    774,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 35,
-							EndLine:   35,
-							StartPos:  762,
-							EndPos:    773,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 35,
-									EndLine:   35,
-									StartPos:  763,
-									EndPos:    767,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 35,
-										EndLine:   35,
-										StartPos:  763,
-										EndPos:    767,
-									},
-								},
-								Value: []byte("$foo"),
-							},
-						},
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 35,
-									EndLine:   35,
-									StartPos:  767,
-									EndPos:    768,
-								},
-							},
-							Value: []byte(" "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 35,
-									EndLine:   35,
-									StartPos:  768,
-									EndPos:    772,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 35,
-										EndLine:   35,
-										StartPos:  768,
-										EndPos:    772,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 36,
-						EndLine:   36,
-						StartPos:  775,
-						EndPos:    794,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 36,
-							EndLine:   36,
-							StartPos:  775,
-							EndPos:    793,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 36,
-									EndLine:   36,
-									StartPos:  776,
-									EndPos:    781,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprPropertyFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 36,
-									EndLine:   36,
-									StartPos:  781,
-									EndPos:    790,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 36,
-										EndLine:   36,
-										StartPos:  781,
-										EndPos:    785,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 36,
-											EndLine:   36,
-											StartPos:  781,
-											EndPos:    785,
-										},
-									},
-									Value: []byte("$foo"),
-								},
-							},
-							Property: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 36,
-										EndLine:   36,
-										StartPos:  787,
-										EndPos:    790,
-									},
-								},
-								Value: []byte("bar"),
-							},
-						},
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 36,
-									EndLine:   36,
-									StartPos:  790,
-									EndPos:    792,
-								},
-							},
-							Value: []byte("()"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 37,
-						EndLine:   37,
-						StartPos:  795,
-						EndPos:    809,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 37,
-							EndLine:   37,
-							StartPos:  795,
-							EndPos:    808,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 37,
-									EndLine:   37,
-									StartPos:  796,
-									EndPos:    801,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 37,
-									EndLine:   37,
-									StartPos:  801,
-									EndPos:    807,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 37,
-										EndLine:   37,
-										StartPos:  803,
-										EndPos:    806,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 38,
-						EndLine:   38,
-						StartPos:  810,
-						EndPos:    827,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 38,
-							EndLine:   38,
-							StartPos:  810,
-							EndPos:    826,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 38,
-									EndLine:   38,
-									StartPos:  811,
-									EndPos:    816,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 38,
-									EndLine:   38,
-									StartPos:  816,
-									EndPos:    825,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 38,
-										EndLine:   38,
-										StartPos:  818,
-										EndPos:    821,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 38,
-											EndLine:   38,
-											StartPos:  818,
-											EndPos:    821,
-										},
-									},
-									Value: []byte("foo"),
-								},
-							},
-							Dim: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 38,
-										EndLine:   38,
-										StartPos:  822,
-										EndPos:    823,
-									},
-								},
-								Value: []byte("0"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 39,
-						EndLine:   39,
-						StartPos:  828,
-						EndPos:    849,
-					},
-				},
-				Expr: &ast.ScalarEncapsed{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 39,
-							EndLine:   39,
-							StartPos:  828,
-							EndPos:    848,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 39,
-									EndLine:   39,
-									StartPos:  829,
-									EndPos:    834,
-								},
-							},
-							Value: []byte("test "),
-						},
-						&ast.ExprMethodCall{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 39,
-									EndLine:   39,
-									StartPos:  835,
-									EndPos:    846,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 39,
-										EndLine:   39,
-										StartPos:  835,
-										EndPos:    839,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 39,
-											EndLine:   39,
-											StartPos:  835,
-											EndPos:    839,
-										},
-									},
-									Value: []byte("$foo"),
-								},
-							},
-							Method: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 39,
-										EndLine:   39,
-										StartPos:  841,
-										EndPos:    844,
-									},
-								},
-								Value: []byte("bar"),
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 39,
-										EndLine:   39,
-										StartPos:  844,
-										EndPos:    846,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 41,
-						EndLine:   42,
-						StartPos:  851,
-						EndPos:    867,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 41,
-							EndLine:   41,
-							StartPos:  855,
-							EndPos:    857,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 41,
-								EndLine:   41,
-								StartPos:  855,
-								EndPos:    857,
-							},
-						},
-						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: 43,
-						EndLine:   45,
-						StartPos:  868,
-						EndPos:    897,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 43,
-							EndLine:   43,
-							StartPos:  872,
-							EndPos:    874,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 43,
-								EndLine:   43,
-								StartPos:  872,
-								EndPos:    874,
-							},
-						},
-						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: 44,
-								EndLine:   -1,
-								StartPos:  878,
-								EndPos:    -1,
-							},
-						},
-						Alt: true,
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 44,
-									EndLine:   44,
-									StartPos:  886,
-									EndPos:    888,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 44,
-										EndLine:   44,
-										StartPos:  886,
-										EndPos:    888,
-									},
-								},
-								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: 46,
-						EndLine:   48,
-						StartPos:  898,
-						EndPos:    920,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 46,
-							EndLine:   46,
-							StartPos:  902,
-							EndPos:    904,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 46,
-								EndLine:   46,
-								StartPos:  902,
-								EndPos:    904,
-							},
-						},
-						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: 47,
-							EndLine:   -1,
-							StartPos:  908,
-							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: 49,
-						EndLine:   53,
-						StartPos:  921,
-						EndPos:    969,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 49,
-							EndLine:   49,
-							StartPos:  925,
-							EndPos:    927,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 49,
-								EndLine:   49,
-								StartPos:  925,
-								EndPos:    927,
-							},
-						},
-						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: 50,
-								EndLine:   -1,
-								StartPos:  931,
-								EndPos:    -1,
-							},
-						},
-						Alt: true,
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 50,
-									EndLine:   50,
-									StartPos:  939,
-									EndPos:    941,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 50,
-										EndLine:   50,
-										StartPos:  939,
-										EndPos:    941,
-									},
-								},
-								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: 51,
-								EndLine:   -1,
-								StartPos:  944,
-								EndPos:    -1,
-							},
-						},
-						Alt: true,
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 51,
-									EndLine:   51,
-									StartPos:  952,
-									EndPos:    954,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 51,
-										EndLine:   51,
-										StartPos:  952,
-										EndPos:    954,
-									},
-								},
-								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: 52,
-							EndLine:   -1,
-							StartPos:  957,
-							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: 55,
-						EndLine:   55,
-						StartPos:  971,
-						EndPos:    991,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 55,
-							EndLine:   55,
-							StartPos:  978,
-							EndPos:    979,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 55,
-							EndLine:   55,
-							StartPos:  981,
-							EndPos:    991,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtBreak{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 55,
-									EndLine:   55,
-									StartPos:  983,
-									EndPos:    989,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 56,
-						EndLine:   56,
-						StartPos:  992,
-						EndPos:    1014,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 56,
-							EndLine:   56,
-							StartPos:  999,
-							EndPos:    1000,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 56,
-							EndLine:   56,
-							StartPos:  1002,
-							EndPos:    1014,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtBreak{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 56,
-									EndLine:   56,
-									StartPos:  1004,
-									EndPos:    1012,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 56,
-										EndLine:   56,
-										StartPos:  1010,
-										EndPos:    1011,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 57,
-						EndLine:   57,
-						StartPos:  1015,
-						EndPos:    1046,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 57,
-							EndLine:   57,
-							StartPos:  1022,
-							EndPos:    1023,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 57,
-							EndLine:   57,
-							StartPos:  1027,
-							EndPos:    1036,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtBreak{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 57,
-									EndLine:   57,
-									StartPos:  1027,
-									EndPos:    1036,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 57,
-										EndLine:   57,
-										StartPos:  1033,
-										EndPos:    1034,
-									},
-								},
-								Value: []byte("3"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 58,
-						EndLine:   58,
-						StartPos:  1047,
-						EndPos:    1083,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 58,
-							EndLine:   58,
-							StartPos:  1053,
-							EndPos:    1056,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassConstList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 58,
-								EndLine:   58,
-								StartPos:  1058,
-								EndPos:    1081,
-							},
-						},
-						Consts: []ast.Vertex{
-							&ast.StmtConstant{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 58,
-										EndLine:   58,
-										StartPos:  1064,
-										EndPos:    1071,
-									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 58,
-											EndLine:   58,
-											StartPos:  1064,
-											EndPos:    1067,
-										},
-									},
-									Value: []byte("FOO"),
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 58,
-											EndLine:   58,
-											StartPos:  1070,
-											EndPos:    1071,
-										},
-									},
-									Value: []byte("1"),
-								},
-							},
-							&ast.StmtConstant{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 58,
-										EndLine:   58,
-										StartPos:  1073,
-										EndPos:    1080,
-									},
-								},
-								Name: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 58,
-											EndLine:   58,
-											StartPos:  1073,
-											EndPos:    1076,
-										},
-									},
-									Value: []byte("BAR"),
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 58,
-											EndLine:   58,
-											StartPos:  1079,
-											EndPos:    1080,
-										},
-									},
-									Value: []byte("2"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 59,
-						EndLine:   59,
-						StartPos:  1084,
-						EndPos:    1114,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 59,
-							EndLine:   59,
-							StartPos:  1090,
-							EndPos:    1093,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 59,
-								EndLine:   59,
-								StartPos:  1095,
-								EndPos:    1112,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 59,
-									EndLine:   59,
-									StartPos:  1104,
-									EndPos:    1107,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 59,
-									EndLine:   59,
-									StartPos:  1110,
-									EndPos:    1112,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 60,
-						EndLine:   60,
-						StartPos:  1115,
-						EndPos:    1160,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 60,
-							EndLine:   60,
-							StartPos:  1121,
-							EndPos:    1124,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 60,
-								EndLine:   60,
-								StartPos:  1126,
-								EndPos:    1158,
-							},
-						},
-						ReturnsRef: true,
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 60,
-									EndLine:   60,
-									StartPos:  1150,
-									EndPos:    1153,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 60,
-										EndLine:   60,
-										StartPos:  1126,
-										EndPos:    1132,
-									},
-								},
-								Value: []byte("public"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 60,
-										EndLine:   60,
-										StartPos:  1133,
-										EndPos:    1139,
-									},
-								},
-								Value: []byte("static"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 60,
-									EndLine:   60,
-									StartPos:  1156,
-									EndPos:    1158,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 61,
-						EndLine:   61,
-						StartPos:  1161,
-						EndPos:    1233,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 61,
-							EndLine:   61,
-							StartPos:  1167,
-							EndPos:    1170,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 61,
-								EndLine:   61,
-								StartPos:  1172,
-								EndPos:    1203,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 61,
-									EndLine:   61,
-									StartPos:  1195,
-									EndPos:    1198,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 61,
-										EndLine:   61,
-										StartPos:  1172,
-										EndPos:    1177,
-									},
-								},
-								Value: []byte("final"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 61,
-										EndLine:   61,
-										StartPos:  1178,
-										EndPos:    1185,
-									},
-								},
-								Value: []byte("private"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 61,
-									EndLine:   61,
-									StartPos:  1201,
-									EndPos:    1203,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 61,
-								EndLine:   61,
-								StartPos:  1204,
-								EndPos:    1231,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 61,
-									EndLine:   61,
-									StartPos:  1223,
-									EndPos:    1226,
-								},
-							},
-							Value: []byte("baz"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 61,
-										EndLine:   61,
-										StartPos:  1204,
-										EndPos:    1213,
-									},
-								},
-								Value: []byte("protected"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 61,
-									EndLine:   61,
-									StartPos:  1229,
-									EndPos:    1231,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 62,
-						EndLine:   62,
-						StartPos:  1234,
-						EndPos:    1287,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 62,
-							EndLine:   62,
-							StartPos:  1249,
-							EndPos:    1252,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 62,
-								EndLine:   62,
-								StartPos:  1234,
-								EndPos:    1242,
-							},
-						},
-						Value: []byte("abstract"),
-					},
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtClassMethod{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 62,
-								EndLine:   62,
-								StartPos:  1254,
-								EndPos:    1285,
-							},
-						},
-						MethodName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 62,
-									EndLine:   62,
-									StartPos:  1279,
-									EndPos:    1282,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 62,
-										EndLine:   62,
-										StartPos:  1254,
-										EndPos:    1262,
-									},
-								},
-								Value: []byte("abstract"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 62,
-										EndLine:   62,
-										StartPos:  1263,
-										EndPos:    1269,
-									},
-								},
-								Value: []byte("public"),
-							},
-						},
-						Stmt: &ast.StmtNop{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 62,
-									EndLine:   62,
-									StartPos:  1284,
-									EndPos:    1285,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 63,
-						EndLine:   63,
-						StartPos:  1288,
-						EndPos:    1319,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 63,
-							EndLine:   63,
-							StartPos:  1300,
-							EndPos:    1303,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 63,
-								EndLine:   63,
-								StartPos:  1288,
-								EndPos:    1293,
-							},
-						},
-						Value: []byte("final"),
-					},
-				},
-				Extends: &ast.StmtClassExtends{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 63,
-							EndLine:   63,
-							StartPos:  1304,
-							EndPos:    1315,
-						},
-					},
-					ClassName: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 63,
-								EndLine:   63,
-								StartPos:  1312,
-								EndPos:    1315,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 63,
-										EndLine:   63,
-										StartPos:  1312,
-										EndPos:    1315,
-									},
-								},
-								Value: []byte("bar"),
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 64,
-						EndLine:   64,
-						StartPos:  1320,
-						EndPos:    1354,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 64,
-							EndLine:   64,
-							StartPos:  1332,
-							EndPos:    1335,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 64,
-								EndLine:   64,
-								StartPos:  1320,
-								EndPos:    1325,
-							},
-						},
-						Value: []byte("final"),
-					},
-				},
-				Implements: &ast.StmtClassImplements{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 64,
-							EndLine:   64,
-							StartPos:  1336,
-							EndPos:    1350,
-						},
-					},
-					InterfaceNames: []ast.Vertex{
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 64,
-									EndLine:   64,
-									StartPos:  1347,
-									EndPos:    1350,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 64,
-											EndLine:   64,
-											StartPos:  1347,
-											EndPos:    1350,
-										},
-									},
-									Value: []byte("bar"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 65,
-						EndLine:   65,
-						StartPos:  1355,
-						EndPos:    1394,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 65,
-							EndLine:   65,
-							StartPos:  1367,
-							EndPos:    1370,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Modifiers: []ast.Vertex{
-					&ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 65,
-								EndLine:   65,
-								StartPos:  1355,
-								EndPos:    1360,
-							},
-						},
-						Value: []byte("final"),
-					},
-				},
-				Implements: &ast.StmtClassImplements{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 65,
-							EndLine:   65,
-							StartPos:  1371,
-							EndPos:    1390,
-						},
-					},
-					InterfaceNames: []ast.Vertex{
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 65,
-									EndLine:   65,
-									StartPos:  1382,
-									EndPos:    1385,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 65,
-											EndLine:   65,
-											StartPos:  1382,
-											EndPos:    1385,
-										},
-									},
-									Value: []byte("bar"),
-								},
-							},
-						},
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 65,
-									EndLine:   65,
-									StartPos:  1387,
-									EndPos:    1390,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 65,
-											EndLine:   65,
-											StartPos:  1387,
-											EndPos:    1390,
-										},
-									},
-									Value: []byte("baz"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtConstList{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 67,
-						EndLine:   67,
-						StartPos:  1396,
-						EndPos:    1419,
-					},
-				},
-				Consts: []ast.Vertex{
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 67,
-								EndLine:   67,
-								StartPos:  1402,
-								EndPos:    1409,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 67,
-									EndLine:   67,
-									StartPos:  1402,
-									EndPos:    1405,
-								},
-							},
-							Value: []byte("FOO"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 67,
-									EndLine:   67,
-									StartPos:  1408,
-									EndPos:    1409,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 67,
-								EndLine:   67,
-								StartPos:  1411,
-								EndPos:    1418,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 67,
-									EndLine:   67,
-									StartPos:  1411,
-									EndPos:    1414,
-								},
-							},
-							Value: []byte("BAR"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 67,
-									EndLine:   67,
-									StartPos:  1417,
-									EndPos:    1418,
-								},
-							},
-							Value: []byte("2"),
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 68,
-						EndLine:   68,
-						StartPos:  1420,
-						EndPos:    1443,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 68,
-							EndLine:   68,
-							StartPos:  1427,
-							EndPos:    1428,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 68,
-							EndLine:   68,
-							StartPos:  1430,
-							EndPos:    1443,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtContinue{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 68,
-									EndLine:   68,
-									StartPos:  1432,
-									EndPos:    1441,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 69,
-						EndLine:   69,
-						StartPos:  1444,
-						EndPos:    1469,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 69,
-							EndLine:   69,
-							StartPos:  1451,
-							EndPos:    1452,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 69,
-							EndLine:   69,
-							StartPos:  1454,
-							EndPos:    1469,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtContinue{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 69,
-									EndLine:   69,
-									StartPos:  1456,
-									EndPos:    1467,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 69,
-										EndLine:   69,
-										StartPos:  1465,
-										EndPos:    1466,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtWhile{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 70,
-						EndLine:   70,
-						StartPos:  1470,
-						EndPos:    1496,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 70,
-							EndLine:   70,
-							StartPos:  1477,
-							EndPos:    1478,
-						},
-					},
-					Value: []byte("1"),
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 70,
-							EndLine:   70,
-							StartPos:  1480,
-							EndPos:    1496,
-						},
-					},
-					Stmts: []ast.Vertex{
-						&ast.StmtContinue{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 70,
-									EndLine:   70,
-									StartPos:  1482,
-									EndPos:    1494,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 70,
-										EndLine:   70,
-										StartPos:  1491,
-										EndPos:    1492,
-									},
-								},
-								Value: []byte("3"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtDeclare{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 71,
-						EndLine:   71,
-						StartPos:  1497,
-						EndPos:    1514,
-					},
-				},
-				Consts: []ast.Vertex{
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 71,
-								EndLine:   71,
-								StartPos:  1505,
-								EndPos:    1512,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 71,
-									EndLine:   71,
-									StartPos:  1505,
-									EndPos:    1510,
-								},
-							},
-							Value: []byte("ticks"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 71,
-									EndLine:   71,
-									StartPos:  1511,
-									EndPos:    1512,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-				Stmt: &ast.StmtNop{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 71,
-							EndLine:   71,
-							StartPos:  1513,
-							EndPos:    1514,
-						},
-					},
-				},
-			},
-			&ast.StmtDeclare{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 72,
-						EndLine:   72,
-						StartPos:  1515,
-						EndPos:    1550,
-					},
-				},
-				Consts: []ast.Vertex{
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 72,
-								EndLine:   72,
-								StartPos:  1523,
-								EndPos:    1530,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 72,
-									EndLine:   72,
-									StartPos:  1523,
-									EndPos:    1528,
-								},
-							},
-							Value: []byte("ticks"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 72,
-									EndLine:   72,
-									StartPos:  1529,
-									EndPos:    1530,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 72,
-								EndLine:   72,
-								StartPos:  1532,
-								EndPos:    1546,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 72,
-									EndLine:   72,
-									StartPos:  1532,
-									EndPos:    1544,
-								},
-							},
-							Value: []byte("strict_types"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 72,
-									EndLine:   72,
-									StartPos:  1545,
-									EndPos:    1546,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 72,
-							EndLine:   72,
-							StartPos:  1548,
-							EndPos:    1550,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtDeclare{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 73,
-						EndLine:   73,
-						StartPos:  1551,
-						EndPos:    1580,
-					},
-				},
-				Alt: true,
-				Consts: []ast.Vertex{
-					&ast.StmtConstant{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 73,
-								EndLine:   73,
-								StartPos:  1559,
-								EndPos:    1566,
-							},
-						},
-						Name: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 73,
-									EndLine:   73,
-									StartPos:  1559,
-									EndPos:    1564,
-								},
-							},
-							Value: []byte("ticks"),
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 73,
-									EndLine:   73,
-									StartPos:  1565,
-									EndPos:    1566,
-								},
-							},
-							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: 74,
-						EndLine:   74,
-						StartPos:  1581,
-						EndPos:    1596,
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 74,
-							EndLine:   74,
-							StartPos:  1584,
-							EndPos:    1586,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 74,
-							EndLine:   74,
-							StartPos:  1593,
-							EndPos:    1594,
-						},
-					},
-					Value: []byte("1"),
-				},
-			},
-			&ast.StmtEcho{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 75,
-						EndLine:   75,
-						StartPos:  1597,
-						EndPos:    1608,
-					},
-				},
-				Exprs: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 75,
-								EndLine:   75,
-								StartPos:  1602,
-								EndPos:    1604,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 75,
-									EndLine:   75,
-									StartPos:  1602,
-									EndPos:    1604,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					&ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 75,
-								EndLine:   75,
-								StartPos:  1606,
-								EndPos:    1607,
-							},
-						},
-						Value: []byte("1"),
-					},
-				},
-			},
-			&ast.StmtEcho{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 76,
-						EndLine:   76,
-						StartPos:  1609,
-						EndPos:    1618,
-					},
-				},
-				Exprs: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 76,
-								EndLine:   76,
-								StartPos:  1614,
-								EndPos:    1616,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 76,
-									EndLine:   76,
-									StartPos:  1614,
-									EndPos:    1616,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtFor{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 77,
-						EndLine:   77,
-						StartPos:  1619,
-						EndPos:    1654,
-					},
-				},
-				Init: []ast.Vertex{
-					&ast.ExprAssign{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 77,
-								EndLine:   77,
-								StartPos:  1623,
-								EndPos:    1629,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 77,
-									EndLine:   77,
-									StartPos:  1623,
-									EndPos:    1625,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 77,
-										EndLine:   77,
-										StartPos:  1623,
-										EndPos:    1625,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 77,
-									EndLine:   77,
-									StartPos:  1628,
-									EndPos:    1629,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-				},
-				Cond: []ast.Vertex{
-					&ast.ExprBinarySmaller{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 77,
-								EndLine:   77,
-								StartPos:  1631,
-								EndPos:    1638,
-							},
-						},
-						Left: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 77,
-									EndLine:   77,
-									StartPos:  1631,
-									EndPos:    1633,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 77,
-										EndLine:   77,
-										StartPos:  1631,
-										EndPos:    1633,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-						Right: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 77,
-									EndLine:   77,
-									StartPos:  1636,
-									EndPos:    1638,
-								},
-							},
-							Value: []byte("10"),
-						},
-					},
-				},
-				Loop: []ast.Vertex{
-					&ast.ExprPostInc{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 77,
-								EndLine:   77,
-								StartPos:  1640,
-								EndPos:    1644,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 77,
-									EndLine:   77,
-									StartPos:  1640,
-									EndPos:    1642,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 77,
-										EndLine:   77,
-										StartPos:  1640,
-										EndPos:    1642,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-					},
-					&ast.ExprPostInc{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 77,
-								EndLine:   77,
-								StartPos:  1646,
-								EndPos:    1650,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 77,
-									EndLine:   77,
-									StartPos:  1646,
-									EndPos:    1648,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 77,
-										EndLine:   77,
-										StartPos:  1646,
-										EndPos:    1648,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 77,
-							EndLine:   77,
-							StartPos:  1652,
-							EndPos:    1654,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtFor{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 78,
-						EndLine:   78,
-						StartPos:  1655,
-						EndPos:    1685,
-					},
-				},
-				Alt: true,
-				Cond: []ast.Vertex{
-					&ast.ExprBinarySmaller{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 78,
-								EndLine:   78,
-								StartPos:  1661,
-								EndPos:    1668,
-							},
-						},
-						Left: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 78,
-									EndLine:   78,
-									StartPos:  1661,
-									EndPos:    1663,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 78,
-										EndLine:   78,
-										StartPos:  1661,
-										EndPos:    1663,
-									},
-								},
-								Value: []byte("$i"),
-							},
-						},
-						Right: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 78,
-									EndLine:   78,
-									StartPos:  1666,
-									EndPos:    1668,
-								},
-							},
-							Value: []byte("10"),
-						},
-					},
-				},
-				Loop: []ast.Vertex{
-					&ast.ExprPostInc{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 78,
-								EndLine:   78,
-								StartPos:  1670,
-								EndPos:    1674,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 78,
-									EndLine:   78,
-									StartPos:  1670,
-									EndPos:    1672,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 78,
-										EndLine:   78,
-										StartPos:  1670,
-										EndPos:    1672,
-									},
-								},
-								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: 79,
-						EndLine:   79,
-						StartPos:  1686,
-						EndPos:    1707,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 79,
-							EndLine:   79,
-							StartPos:  1695,
-							EndPos:    1697,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 79,
-								EndLine:   79,
-								StartPos:  1695,
-								EndPos:    1697,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Var: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 79,
-							EndLine:   79,
-							StartPos:  1701,
-							EndPos:    1703,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 79,
-								EndLine:   79,
-								StartPos:  1701,
-								EndPos:    1703,
-							},
-						},
-						Value: []byte("$v"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 79,
-							EndLine:   79,
-							StartPos:  1705,
-							EndPos:    1707,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 80,
-						EndLine:   80,
-						StartPos:  1708,
-						EndPos:    1729,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 80,
-							EndLine:   80,
-							StartPos:  1717,
-							EndPos:    1719,
-						},
-					},
-					Items: []ast.Vertex{},
-				},
-				Var: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 80,
-							EndLine:   80,
-							StartPos:  1723,
-							EndPos:    1725,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 80,
-								EndLine:   80,
-								StartPos:  1723,
-								EndPos:    1725,
-							},
-						},
-						Value: []byte("$v"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 80,
-							EndLine:   80,
-							StartPos:  1727,
-							EndPos:    1729,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 81,
-						EndLine:   81,
-						StartPos:  1730,
-						EndPos:    1762,
-					},
-				},
-				Alt: true,
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 81,
-							EndLine:   81,
-							StartPos:  1739,
-							EndPos:    1741,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 81,
-								EndLine:   81,
-								StartPos:  1739,
-								EndPos:    1741,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Var: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 81,
-							EndLine:   81,
-							StartPos:  1745,
-							EndPos:    1747,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 81,
-								EndLine:   81,
-								StartPos:  1745,
-								EndPos:    1747,
-							},
-						},
-						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: 82,
-						EndLine:   82,
-						StartPos:  1763,
-						EndPos:    1790,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 82,
-							EndLine:   82,
-							StartPos:  1772,
-							EndPos:    1774,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 82,
-								EndLine:   82,
-								StartPos:  1772,
-								EndPos:    1774,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Key: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 82,
-							EndLine:   82,
-							StartPos:  1778,
-							EndPos:    1780,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 82,
-								EndLine:   82,
-								StartPos:  1778,
-								EndPos:    1780,
-							},
-						},
-						Value: []byte("$k"),
-					},
-				},
-				Var: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 82,
-							EndLine:   82,
-							StartPos:  1784,
-							EndPos:    1786,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 82,
-								EndLine:   82,
-								StartPos:  1784,
-								EndPos:    1786,
-							},
-						},
-						Value: []byte("$v"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 82,
-							EndLine:   82,
-							StartPos:  1788,
-							EndPos:    1790,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 83,
-						EndLine:   83,
-						StartPos:  1791,
-						EndPos:    1818,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 83,
-							EndLine:   83,
-							StartPos:  1800,
-							EndPos:    1802,
-						},
-					},
-					Items: []ast.Vertex{},
-				},
-				Key: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 83,
-							EndLine:   83,
-							StartPos:  1806,
-							EndPos:    1808,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 83,
-								EndLine:   83,
-								StartPos:  1806,
-								EndPos:    1808,
-							},
-						},
-						Value: []byte("$k"),
-					},
-				},
-				Var: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 83,
-							EndLine:   83,
-							StartPos:  1812,
-							EndPos:    1814,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 83,
-								EndLine:   83,
-								StartPos:  1812,
-								EndPos:    1814,
-							},
-						},
-						Value: []byte("$v"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 83,
-							EndLine:   83,
-							StartPos:  1816,
-							EndPos:    1818,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 84,
-						EndLine:   84,
-						StartPos:  1819,
-						EndPos:    1847,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 84,
-							EndLine:   84,
-							StartPos:  1828,
-							EndPos:    1830,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 84,
-								EndLine:   84,
-								StartPos:  1828,
-								EndPos:    1830,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Key: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 84,
-							EndLine:   84,
-							StartPos:  1834,
-							EndPos:    1836,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 84,
-								EndLine:   84,
-								StartPos:  1834,
-								EndPos:    1836,
-							},
-						},
-						Value: []byte("$k"),
-					},
-				},
-				Var: &ast.ExprReference{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 84,
-							EndLine:   84,
-							StartPos:  1840,
-							EndPos:    1843,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 84,
-								EndLine:   84,
-								StartPos:  1841,
-								EndPos:    1843,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 84,
-									EndLine:   84,
-									StartPos:  1841,
-									EndPos:    1843,
-								},
-							},
-							Value: []byte("$v"),
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 84,
-							EndLine:   84,
-							StartPos:  1845,
-							EndPos:    1847,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtForeach{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 85,
-						EndLine:   85,
-						StartPos:  1848,
-						EndPos:    1881,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 85,
-							EndLine:   85,
-							StartPos:  1857,
-							EndPos:    1859,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 85,
-								EndLine:   85,
-								StartPos:  1857,
-								EndPos:    1859,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Key: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 85,
-							EndLine:   85,
-							StartPos:  1863,
-							EndPos:    1865,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 85,
-								EndLine:   85,
-								StartPos:  1863,
-								EndPos:    1865,
-							},
-						},
-						Value: []byte("$k"),
-					},
-				},
-				Var: &ast.ExprList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 85,
-							EndLine:   85,
-							StartPos:  1869,
-							EndPos:    1877,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 85,
-									EndLine:   85,
-									StartPos:  1874,
-									EndPos:    1876,
-								},
-							},
-							Val: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 85,
-										EndLine:   85,
-										StartPos:  1874,
-										EndPos:    1876,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 85,
-											EndLine:   85,
-											StartPos:  1874,
-											EndPos:    1876,
-										},
-									},
-									Value: []byte("$v"),
-								},
-							},
-						},
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 85,
-							EndLine:   85,
-							StartPos:  1879,
-							EndPos:    1881,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 86,
-						EndLine:   86,
-						StartPos:  1882,
-						EndPos:    1899,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 86,
-							EndLine:   86,
-							StartPos:  1891,
-							EndPos:    1894,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 88,
-						EndLine:   92,
-						StartPos:  1901,
-						EndPos:    1973,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 88,
-							EndLine:   88,
-							StartPos:  1910,
-							EndPos:    1913,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtFunction{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 89,
-								EndLine:   89,
-								StartPos:  1922,
-								EndPos:    1939,
-							},
-						},
-						FunctionName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 89,
-									EndLine:   89,
-									StartPos:  1931,
-									EndPos:    1934,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtClass{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 90,
-								EndLine:   90,
-								StartPos:  1944,
-								EndPos:    1956,
-							},
-						},
-						ClassName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 90,
-									EndLine:   90,
-									StartPos:  1950,
-									EndPos:    1953,
-								},
-							},
-							Value: []byte("Baz"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtReturn{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 91,
-								EndLine:   91,
-								StartPos:  1961,
-								EndPos:    1971,
-							},
-						},
-						Expr: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 91,
-									EndLine:   91,
-									StartPos:  1968,
-									EndPos:    1970,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 91,
-										EndLine:   91,
-										StartPos:  1968,
-										EndPos:    1970,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 94,
-						EndLine:   94,
-						StartPos:  1975,
-						EndPos:    2020,
-					},
-				},
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 94,
-							EndLine:   94,
-							StartPos:  1984,
-							EndPos:    1987,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Params: []ast.Vertex{
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 94,
-								EndLine:   94,
-								StartPos:  1988,
-								EndPos:    1996,
-							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 94,
-									EndLine:   94,
-									StartPos:  1988,
-									EndPos:    1993,
-								},
-							},
-							Value: []byte("array"),
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 94,
-									EndLine:   94,
-									StartPos:  1994,
-									EndPos:    1996,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 94,
-										EndLine:   94,
-										StartPos:  1994,
-										EndPos:    1996,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-					},
-					&ast.Parameter{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 94,
-								EndLine:   94,
-								StartPos:  1998,
-								EndPos:    2009,
-							},
-						},
-						Type: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 94,
-									EndLine:   94,
-									StartPos:  1998,
-									EndPos:    2006,
-								},
-							},
-							Value: []byte("callable"),
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 94,
-									EndLine:   94,
-									StartPos:  2007,
-									EndPos:    2009,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 94,
-										EndLine:   94,
-										StartPos:  2007,
-										EndPos:    2009,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtReturn{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 94,
-								EndLine:   94,
-								StartPos:  2012,
-								EndPos:    2019,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 95,
-						EndLine:   95,
-						StartPos:  2021,
-						EndPos:    2048,
-					},
-				},
-				ReturnsRef: true,
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 95,
-							EndLine:   95,
-							StartPos:  2031,
-							EndPos:    2034,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtReturn{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 95,
-								EndLine:   95,
-								StartPos:  2038,
-								EndPos:    2047,
-							},
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 95,
-									EndLine:   95,
-									StartPos:  2045,
-									EndPos:    2046,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-			},
-			&ast.StmtFunction{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 96,
-						EndLine:   96,
-						StartPos:  2049,
-						EndPos:    2067,
-					},
-				},
-				ReturnsRef: true,
-				FunctionName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 96,
-							EndLine:   96,
-							StartPos:  2059,
-							EndPos:    2062,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtGlobal{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 97,
-						EndLine:   97,
-						StartPos:  2068,
-						EndPos:    2097,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 97,
-								EndLine:   97,
-								StartPos:  2075,
-								EndPos:    2077,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 97,
-									EndLine:   97,
-									StartPos:  2075,
-									EndPos:    2077,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 97,
-								EndLine:   97,
-								StartPos:  2079,
-								EndPos:    2081,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 97,
-									EndLine:   97,
-									StartPos:  2079,
-									EndPos:    2081,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 97,
-								EndLine:   97,
-								StartPos:  2083,
-								EndPos:    2086,
-							},
-						},
-						VarName: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 97,
-									EndLine:   97,
-									StartPos:  2084,
-									EndPos:    2086,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 97,
-										EndLine:   97,
-										StartPos:  2084,
-										EndPos:    2086,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-					},
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 97,
-								EndLine:   97,
-								StartPos:  2088,
-								EndPos:    2096,
-							},
-						},
-						VarName: &ast.ExprFunctionCall{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 97,
-									EndLine:   97,
-									StartPos:  2090,
-									EndPos:    2095,
-								},
-							},
-							Function: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 97,
-										EndLine:   97,
-										StartPos:  2090,
-										EndPos:    2093,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 97,
-												EndLine:   97,
-												StartPos:  2090,
-												EndPos:    2093,
-											},
-										},
-										Value: []byte("foo"),
-									},
-								},
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 97,
-										EndLine:   97,
-										StartPos:  2093,
-										EndPos:    2095,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtLabel{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 98,
-						EndLine:   98,
-						StartPos:  2098,
-						EndPos:    2100,
-					},
-				},
-				LabelName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 98,
-							EndLine:   98,
-							StartPos:  2098,
-							EndPos:    2099,
-						},
-					},
-					Value: []byte("a"),
-				},
-			},
-			&ast.StmtGoto{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 99,
-						EndLine:   99,
-						StartPos:  2101,
-						EndPos:    2108,
-					},
-				},
-				Label: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 99,
-							EndLine:   99,
-							StartPos:  2106,
-							EndPos:    2107,
-						},
-					},
-					Value: []byte("a"),
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 100,
-						EndLine:   100,
-						StartPos:  2109,
-						EndPos:    2119,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 100,
-							EndLine:   100,
-							StartPos:  2113,
-							EndPos:    2115,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 100,
-								EndLine:   100,
-								StartPos:  2113,
-								EndPos:    2115,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 100,
-							EndLine:   100,
-							StartPos:  2117,
-							EndPos:    2119,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 101,
-						EndLine:   101,
-						StartPos:  2120,
-						EndPos:    2145,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 101,
-							EndLine:   101,
-							StartPos:  2124,
-							EndPos:    2126,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 101,
-								EndLine:   101,
-								StartPos:  2124,
-								EndPos:    2126,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 101,
-							EndLine:   101,
-							StartPos:  2128,
-							EndPos:    2130,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				ElseIf: []ast.Vertex{
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 101,
-								EndLine:   101,
-								StartPos:  2131,
-								EndPos:    2145,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 101,
-									EndLine:   101,
-									StartPos:  2139,
-									EndPos:    2141,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 101,
-										EndLine:   101,
-										StartPos:  2139,
-										EndPos:    2141,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 101,
-									EndLine:   101,
-									StartPos:  2143,
-									EndPos:    2145,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 102,
-						EndLine:   102,
-						StartPos:  2146,
-						EndPos:    2164,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 102,
-							EndLine:   102,
-							StartPos:  2150,
-							EndPos:    2152,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 102,
-								EndLine:   102,
-								StartPos:  2150,
-								EndPos:    2152,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 102,
-							EndLine:   102,
-							StartPos:  2154,
-							EndPos:    2156,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 102,
-							EndLine:   102,
-							StartPos:  2157,
-							EndPos:    2164,
-						},
-					},
-					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 102,
-								EndLine:   102,
-								StartPos:  2162,
-								EndPos:    2164,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 103,
-						EndLine:   103,
-						StartPos:  2165,
-						EndPos:    2213,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 103,
-							EndLine:   103,
-							StartPos:  2169,
-							EndPos:    2171,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 103,
-								EndLine:   103,
-								StartPos:  2169,
-								EndPos:    2171,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 103,
-							EndLine:   103,
-							StartPos:  2173,
-							EndPos:    2175,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				ElseIf: []ast.Vertex{
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 103,
-								EndLine:   103,
-								StartPos:  2176,
-								EndPos:    2190,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 103,
-									EndLine:   103,
-									StartPos:  2184,
-									EndPos:    2186,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 103,
-										EndLine:   103,
-										StartPos:  2184,
-										EndPos:    2186,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 103,
-									EndLine:   103,
-									StartPos:  2188,
-									EndPos:    2190,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 103,
-								EndLine:   103,
-								StartPos:  2191,
-								EndPos:    2205,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 103,
-									EndLine:   103,
-									StartPos:  2199,
-									EndPos:    2201,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 103,
-										EndLine:   103,
-										StartPos:  2199,
-										EndPos:    2201,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 103,
-									EndLine:   103,
-									StartPos:  2203,
-									EndPos:    2205,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 103,
-							EndLine:   103,
-							StartPos:  2206,
-							EndPos:    2213,
-						},
-					},
-					Stmt: &ast.StmtStmtList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 103,
-								EndLine:   103,
-								StartPos:  2211,
-								EndPos:    2213,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 104,
-						EndLine:   104,
-						StartPos:  2214,
-						EndPos:    2263,
-					},
-				},
-				Cond: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 104,
-							EndLine:   104,
-							StartPos:  2218,
-							EndPos:    2220,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 104,
-								EndLine:   104,
-								StartPos:  2218,
-								EndPos:    2220,
-							},
-						},
-						Value: []byte("$a"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 104,
-							EndLine:   104,
-							StartPos:  2222,
-							EndPos:    2224,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-				ElseIf: []ast.Vertex{
-					&ast.StmtElseIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 104,
-								EndLine:   104,
-								StartPos:  2225,
-								EndPos:    2239,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 104,
-									EndLine:   104,
-									StartPos:  2233,
-									EndPos:    2235,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 104,
-										EndLine:   104,
-										StartPos:  2233,
-										EndPos:    2235,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 104,
-									EndLine:   104,
-									StartPos:  2237,
-									EndPos:    2239,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-					},
-				},
-				Else: &ast.StmtElse{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 104,
-							EndLine:   104,
-							StartPos:  2240,
-							EndPos:    2263,
-						},
-					},
-					Stmt: &ast.StmtIf{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 104,
-								EndLine:   104,
-								StartPos:  2245,
-								EndPos:    2263,
-							},
-						},
-						Cond: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 104,
-									EndLine:   104,
-									StartPos:  2249,
-									EndPos:    2251,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 104,
-										EndLine:   104,
-										StartPos:  2249,
-										EndPos:    2251,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-						Stmt: &ast.StmtStmtList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 104,
-									EndLine:   104,
-									StartPos:  2253,
-									EndPos:    2255,
-								},
-							},
-							Stmts: []ast.Vertex{},
-						},
-						Else: &ast.StmtElse{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 104,
-									EndLine:   104,
-									StartPos:  2256,
-									EndPos:    2263,
-								},
-							},
-							Stmt: &ast.StmtStmtList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 104,
-										EndLine:   104,
-										StartPos:  2261,
-										EndPos:    2263,
-									},
-								},
-								Stmts: []ast.Vertex{},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtNop{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 105,
-						EndLine:   105,
-						StartPos:  2264,
-						EndPos:    2266,
-					},
-				},
-			},
-			&ast.StmtInlineHtml{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 105,
-						EndLine:   105,
-						StartPos:  2266,
-						EndPos:    2279,
-					},
-				},
-				Value: []byte(" <div></div> "),
-			},
-			&ast.StmtInterface{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 106,
-						EndLine:   106,
-						StartPos:  2282,
-						EndPos:    2298,
-					},
-				},
-				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 106,
-							EndLine:   106,
-							StartPos:  2292,
-							EndPos:    2295,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtInterface{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 107,
-						EndLine:   107,
-						StartPos:  2299,
-						EndPos:    2327,
-					},
-				},
-				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 107,
-							EndLine:   107,
-							StartPos:  2309,
-							EndPos:    2312,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Extends: &ast.StmtInterfaceExtends{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 107,
-							EndLine:   107,
-							StartPos:  2313,
-							EndPos:    2324,
-						},
-					},
-					InterfaceNames: []ast.Vertex{
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 107,
-									EndLine:   107,
-									StartPos:  2321,
-									EndPos:    2324,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 107,
-											EndLine:   107,
-											StartPos:  2321,
-											EndPos:    2324,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtInterface{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 108,
-						EndLine:   108,
-						StartPos:  2328,
-						EndPos:    2361,
-					},
-				},
-				InterfaceName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 108,
-							EndLine:   108,
-							StartPos:  2338,
-							EndPos:    2341,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Extends: &ast.StmtInterfaceExtends{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 108,
-							EndLine:   108,
-							StartPos:  2342,
-							EndPos:    2358,
-						},
-					},
-					InterfaceNames: []ast.Vertex{
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 108,
-									EndLine:   108,
-									StartPos:  2350,
-									EndPos:    2353,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 108,
-											EndLine:   108,
-											StartPos:  2350,
-											EndPos:    2353,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						&ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 108,
-									EndLine:   108,
-									StartPos:  2355,
-									EndPos:    2358,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 108,
-											EndLine:   108,
-											StartPos:  2355,
-											EndPos:    2358,
-										},
-									},
-									Value: []byte("Baz"),
-								},
-							},
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtNamespace{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 109,
-						EndLine:   109,
-						StartPos:  2362,
-						EndPos:    2376,
-					},
-				},
-				Name: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 109,
-							EndLine:   109,
-							StartPos:  2372,
-							EndPos:    2375,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 109,
-									EndLine:   109,
-									StartPos:  2372,
-									EndPos:    2375,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-					},
-				},
-			},
-			&ast.StmtNamespace{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 110,
-						EndLine:   110,
-						StartPos:  2377,
-						EndPos:    2397,
-					},
-				},
-				Name: &ast.NameName{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 110,
-							EndLine:   110,
-							StartPos:  2387,
-							EndPos:    2394,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 110,
-									EndLine:   110,
-									StartPos:  2387,
-									EndPos:    2390,
-								},
-							},
-							Value: []byte("Foo"),
-						},
-						&ast.NameNamePart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 110,
-									EndLine:   110,
-									StartPos:  2390,
-									EndPos:    2394,
-								},
-							},
-							Value: []byte("Bar"),
-						},
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtNamespace{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 111,
-						EndLine:   111,
-						StartPos:  2398,
-						EndPos:    2410,
-					},
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 112,
-						EndLine:   112,
-						StartPos:  2411,
-						EndPos:    2430,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 112,
-							EndLine:   112,
-							StartPos:  2417,
-							EndPos:    2420,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 112,
-								EndLine:   112,
-								StartPos:  2422,
-								EndPos:    2429,
-							},
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 112,
-										EndLine:   112,
-										StartPos:  2422,
-										EndPos:    2425,
-									},
-								},
-								Value: []byte("var"),
-							},
-						},
-						Properties: []ast.Vertex{
-							&ast.StmtProperty{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 112,
-										EndLine:   112,
-										StartPos:  2426,
-										EndPos:    2428,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 112,
-											EndLine:   112,
-											StartPos:  2426,
-											EndPos:    2428,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 112,
-												EndLine:   112,
-												StartPos:  2426,
-												EndPos:    2428,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 113,
-						EndLine:   113,
-						StartPos:  2431,
-						EndPos:    2468,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 113,
-							EndLine:   113,
-							StartPos:  2437,
-							EndPos:    2440,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 113,
-								EndLine:   113,
-								StartPos:  2442,
-								EndPos:    2467,
-							},
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 113,
-										EndLine:   113,
-										StartPos:  2442,
-										EndPos:    2448,
-									},
-								},
-								Value: []byte("public"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 113,
-										EndLine:   113,
-										StartPos:  2449,
-										EndPos:    2455,
-									},
-								},
-								Value: []byte("static"),
-							},
-						},
-						Properties: []ast.Vertex{
-							&ast.StmtProperty{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 113,
-										EndLine:   113,
-										StartPos:  2456,
-										EndPos:    2458,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 113,
-											EndLine:   113,
-											StartPos:  2456,
-											EndPos:    2458,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 113,
-												EndLine:   113,
-												StartPos:  2456,
-												EndPos:    2458,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.StmtProperty{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 113,
-										EndLine:   113,
-										StartPos:  2460,
-										EndPos:    2466,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 113,
-											EndLine:   113,
-											StartPos:  2460,
-											EndPos:    2462,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 113,
-												EndLine:   113,
-												StartPos:  2460,
-												EndPos:    2462,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 113,
-											EndLine:   113,
-											StartPos:  2465,
-											EndPos:    2466,
-										},
-									},
-									Value: []byte("1"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 114,
-						EndLine:   114,
-						StartPos:  2469,
-						EndPos:    2506,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 114,
-							EndLine:   114,
-							StartPos:  2475,
-							EndPos:    2478,
-						},
-					},
-					Value: []byte("foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtPropertyList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 114,
-								EndLine:   114,
-								StartPos:  2480,
-								EndPos:    2505,
-							},
-						},
-						Modifiers: []ast.Vertex{
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 114,
-										EndLine:   114,
-										StartPos:  2480,
-										EndPos:    2486,
-									},
-								},
-								Value: []byte("public"),
-							},
-							&ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 114,
-										EndLine:   114,
-										StartPos:  2487,
-										EndPos:    2493,
-									},
-								},
-								Value: []byte("static"),
-							},
-						},
-						Properties: []ast.Vertex{
-							&ast.StmtProperty{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 114,
-										EndLine:   114,
-										StartPos:  2494,
-										EndPos:    2500,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 114,
-											EndLine:   114,
-											StartPos:  2494,
-											EndPos:    2496,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 114,
-												EndLine:   114,
-												StartPos:  2494,
-												EndPos:    2496,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-								Expr: &ast.ScalarLnumber{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 114,
-											EndLine:   114,
-											StartPos:  2499,
-											EndPos:    2500,
-										},
-									},
-									Value: []byte("1"),
-								},
-							},
-							&ast.StmtProperty{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 114,
-										EndLine:   114,
-										StartPos:  2502,
-										EndPos:    2504,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 114,
-											EndLine:   114,
-											StartPos:  2502,
-											EndPos:    2504,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 114,
-												EndLine:   114,
-												StartPos:  2502,
-												EndPos:    2504,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 115,
-						EndLine:   115,
-						StartPos:  2507,
-						EndPos:    2525,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 115,
-								EndLine:   115,
-								StartPos:  2514,
-								EndPos:    2516,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 115,
-									EndLine:   115,
-									StartPos:  2514,
-									EndPos:    2516,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 115,
-										EndLine:   115,
-										StartPos:  2514,
-										EndPos:    2516,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-					},
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 115,
-								EndLine:   115,
-								StartPos:  2518,
-								EndPos:    2524,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 115,
-									EndLine:   115,
-									StartPos:  2518,
-									EndPos:    2520,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 115,
-										EndLine:   115,
-										StartPos:  2518,
-										EndPos:    2520,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 115,
-									EndLine:   115,
-									StartPos:  2523,
-									EndPos:    2524,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 116,
-						EndLine:   116,
-						StartPos:  2526,
-						EndPos:    2544,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 116,
-								EndLine:   116,
-								StartPos:  2533,
-								EndPos:    2539,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 116,
-									EndLine:   116,
-									StartPos:  2533,
-									EndPos:    2535,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 116,
-										EndLine:   116,
-										StartPos:  2533,
-										EndPos:    2535,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 116,
-									EndLine:   116,
-									StartPos:  2538,
-									EndPos:    2539,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 116,
-								EndLine:   116,
-								StartPos:  2541,
-								EndPos:    2543,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 116,
-									EndLine:   116,
-									StartPos:  2541,
-									EndPos:    2543,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 116,
-										EndLine:   116,
-										StartPos:  2541,
-										EndPos:    2543,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 118,
-						EndLine:   122,
-						StartPos:  2546,
-						EndPos:    2606,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 118,
-							EndLine:   118,
-							StartPos:  2554,
-							EndPos:    2555,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 119,
-								EndLine:   -1,
-								StartPos:  2563,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 119,
-									EndLine:   119,
-									StartPos:  2568,
-									EndPos:    2569,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtDefault{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 120,
-								EndLine:   -1,
-								StartPos:  2575,
-								EndPos:    -1,
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 121,
-								EndLine:   -1,
-								StartPos:  2588,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 121,
-									EndLine:   121,
-									StartPos:  2593,
-									EndPos:    2594,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 124,
-						EndLine:   127,
-						StartPos:  2608,
-						EndPos:    2656,
-					},
-				},
-				Alt: true,
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 124,
-							EndLine:   124,
-							StartPos:  2616,
-							EndPos:    2617,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 125,
-								EndLine:   -1,
-								StartPos:  2626,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 125,
-									EndLine:   125,
-									StartPos:  2631,
-									EndPos:    2632,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 126,
-								EndLine:   -1,
-								StartPos:  2638,
-								EndPos:    -1,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 126,
-									EndLine:   126,
-									StartPos:  2643,
-									EndPos:    2644,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 129,
-						EndLine:   132,
-						StartPos:  2658,
-						EndPos:    2710,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 129,
-							EndLine:   129,
-							StartPos:  2666,
-							EndPos:    2667,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 130,
-								EndLine:   130,
-								StartPos:  2675,
-								EndPos:    2689,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 130,
-									EndLine:   130,
-									StartPos:  2680,
-									EndPos:    2681,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 130,
-										EndLine:   130,
-										StartPos:  2683,
-										EndPos:    2689,
-									},
-								},
-							},
-						},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 131,
-								EndLine:   131,
-								StartPos:  2694,
-								EndPos:    2708,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 131,
-									EndLine:   131,
-									StartPos:  2699,
-									EndPos:    2700,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 131,
-										EndLine:   131,
-										StartPos:  2702,
-										EndPos:    2708,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtSwitch{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 134,
-						EndLine:   137,
-						StartPos:  2712,
-						EndPos:    2765,
-					},
-				},
-				Cond: &ast.ScalarLnumber{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 134,
-							EndLine:   134,
-							StartPos:  2720,
-							EndPos:    2721,
-						},
-					},
-					Value: []byte("1"),
-				},
-				CaseList: []ast.Vertex{
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 135,
-								EndLine:   135,
-								StartPos:  2730,
-								EndPos:    2744,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 135,
-									EndLine:   135,
-									StartPos:  2735,
-									EndPos:    2736,
-								},
-							},
-							Value: []byte("1"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 135,
-										EndLine:   135,
-										StartPos:  2738,
-										EndPos:    2744,
-									},
-								},
-							},
-						},
-					},
-					&ast.StmtCase{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 136,
-								EndLine:   136,
-								StartPos:  2749,
-								EndPos:    2763,
-							},
-						},
-						Cond: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 136,
-									EndLine:   136,
-									StartPos:  2754,
-									EndPos:    2755,
-								},
-							},
-							Value: []byte("2"),
-						},
-						Stmts: []ast.Vertex{
-							&ast.StmtBreak{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 136,
-										EndLine:   136,
-										StartPos:  2757,
-										EndPos:    2763,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtThrow{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 138,
-						EndLine:   138,
-						StartPos:  2766,
-						EndPos:    2775,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 138,
-							EndLine:   138,
-							StartPos:  2772,
-							EndPos:    2774,
-						},
-					},
-					VarName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 138,
-								EndLine:   138,
-								StartPos:  2772,
-								EndPos:    2774,
-							},
-						},
-						Value: []byte("$e"),
-					},
-				},
-			},
-			&ast.StmtTrait{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 139,
-						EndLine:   139,
-						StartPos:  2776,
-						EndPos:    2788,
-					},
-				},
-				TraitName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 139,
-							EndLine:   139,
-							StartPos:  2782,
-							EndPos:    2785,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 140,
-						EndLine:   140,
-						StartPos:  2789,
-						EndPos:    2811,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 140,
-							EndLine:   140,
-							StartPos:  2795,
-							EndPos:    2798,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 140,
-								EndLine:   140,
-								StartPos:  2801,
-								EndPos:    2809,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 140,
-										EndLine:   140,
-										StartPos:  2805,
-										EndPos:    2808,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 140,
-												EndLine:   140,
-												StartPos:  2805,
-												EndPos:    2808,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtNop{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 140,
-									EndLine:   140,
-									StartPos:  2808,
-									EndPos:    2809,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 141,
-						EndLine:   141,
-						StartPos:  2812,
-						EndPos:    2841,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 141,
-							EndLine:   141,
-							StartPos:  2818,
-							EndPos:    2821,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 141,
-								EndLine:   141,
-								StartPos:  2824,
-								EndPos:    2839,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 141,
-										EndLine:   141,
-										StartPos:  2828,
-										EndPos:    2831,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 141,
-												EndLine:   141,
-												StartPos:  2828,
-												EndPos:    2831,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 141,
-										EndLine:   141,
-										StartPos:  2833,
-										EndPos:    2836,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 141,
-												EndLine:   141,
-												StartPos:  2833,
-												EndPos:    2836,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 141,
-									EndLine:   141,
-									StartPos:  2837,
-									EndPos:    2839,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 142,
-						EndLine:   142,
-						StartPos:  2842,
-						EndPos:    2887,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 142,
-							EndLine:   142,
-							StartPos:  2848,
-							EndPos:    2851,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 142,
-								EndLine:   142,
-								StartPos:  2854,
-								EndPos:    2885,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 142,
-										EndLine:   142,
-										StartPos:  2858,
-										EndPos:    2861,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 142,
-												EndLine:   142,
-												StartPos:  2858,
-												EndPos:    2861,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 142,
-										EndLine:   142,
-										StartPos:  2863,
-										EndPos:    2866,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 142,
-												EndLine:   142,
-												StartPos:  2863,
-												EndPos:    2866,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 142,
-									EndLine:   142,
-									StartPos:  2867,
-									EndPos:    2885,
-								},
-							},
-							Adaptations: []ast.Vertex{
-								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 142,
-											EndLine:   142,
-											StartPos:  2869,
-											EndPos:    2882,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 142,
-												EndLine:   142,
-												StartPos:  2869,
-												EndPos:    2872,
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 142,
-													EndLine:   142,
-													StartPos:  2869,
-													EndPos:    2872,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Modifier: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 142,
-												EndLine:   142,
-												StartPos:  2876,
-												EndPos:    2882,
-											},
-										},
-										Value: []byte("public"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 143,
-						EndLine:   143,
-						StartPos:  2888,
-						EndPos:    2937,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 143,
-							EndLine:   143,
-							StartPos:  2894,
-							EndPos:    2897,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 143,
-								EndLine:   143,
-								StartPos:  2900,
-								EndPos:    2935,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 143,
-										EndLine:   143,
-										StartPos:  2904,
-										EndPos:    2907,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 143,
-												EndLine:   143,
-												StartPos:  2904,
-												EndPos:    2907,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 143,
-										EndLine:   143,
-										StartPos:  2909,
-										EndPos:    2912,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 143,
-												EndLine:   143,
-												StartPos:  2909,
-												EndPos:    2912,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 143,
-									EndLine:   143,
-									StartPos:  2913,
-									EndPos:    2935,
-								},
-							},
-							Adaptations: []ast.Vertex{
-								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 143,
-											EndLine:   143,
-											StartPos:  2915,
-											EndPos:    2932,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 143,
-												EndLine:   143,
-												StartPos:  2915,
-												EndPos:    2918,
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 143,
-													EndLine:   143,
-													StartPos:  2915,
-													EndPos:    2918,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Modifier: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 143,
-												EndLine:   143,
-												StartPos:  2922,
-												EndPos:    2928,
-											},
-										},
-										Value: []byte("public"),
-									},
-									Alias: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 143,
-												EndLine:   143,
-												StartPos:  2929,
-												EndPos:    2932,
-											},
-										},
-										Value: []byte("two"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtClass{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 144,
-						EndLine:   144,
-						StartPos:  2938,
-						EndPos:    3015,
-					},
-				},
-				ClassName: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 144,
-							EndLine:   144,
-							StartPos:  2944,
-							EndPos:    2947,
-						},
-					},
-					Value: []byte("Foo"),
-				},
-				Stmts: []ast.Vertex{
-					&ast.StmtTraitUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 144,
-								EndLine:   144,
-								StartPos:  2950,
-								EndPos:    3013,
-							},
-						},
-						Traits: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 144,
-										EndLine:   144,
-										StartPos:  2954,
-										EndPos:    2957,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 144,
-												EndLine:   144,
-												StartPos:  2954,
-												EndPos:    2957,
-											},
-										},
-										Value: []byte("Bar"),
-									},
-								},
-							},
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 144,
-										EndLine:   144,
-										StartPos:  2959,
-										EndPos:    2962,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 144,
-												EndLine:   144,
-												StartPos:  2959,
-												EndPos:    2962,
-											},
-										},
-										Value: []byte("Baz"),
-									},
-								},
-							},
-						},
-						TraitAdaptationList: &ast.StmtTraitAdaptationList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 144,
-									EndLine:   144,
-									StartPos:  2963,
-									EndPos:    3013,
-								},
-							},
-							Adaptations: []ast.Vertex{
-								&ast.StmtTraitUsePrecedence{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 144,
-											EndLine:   144,
-											StartPos:  2965,
-											EndPos:    2993,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 144,
-												EndLine:   144,
-												StartPos:  2965,
-												EndPos:    2973,
-											},
-										},
-										Trait: &ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 144,
-													EndLine:   144,
-													StartPos:  2965,
-													EndPos:    2968,
-												},
-											},
-											Parts: []ast.Vertex{
-												&ast.NameNamePart{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 144,
-															EndLine:   144,
-															StartPos:  2965,
-															EndPos:    2968,
-														},
-													},
-													Value: []byte("Bar"),
-												},
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 144,
-													EndLine:   144,
-													StartPos:  2970,
-													EndPos:    2973,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Insteadof: []ast.Vertex{
-										&ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 144,
-													EndLine:   144,
-													StartPos:  2984,
-													EndPos:    2987,
-												},
-											},
-											Parts: []ast.Vertex{
-												&ast.NameNamePart{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 144,
-															EndLine:   144,
-															StartPos:  2984,
-															EndPos:    2987,
-														},
-													},
-													Value: []byte("Baz"),
-												},
-											},
-										},
-										&ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 144,
-													EndLine:   144,
-													StartPos:  2989,
-													EndPos:    2993,
-												},
-											},
-											Parts: []ast.Vertex{
-												&ast.NameNamePart{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 144,
-															EndLine:   144,
-															StartPos:  2989,
-															EndPos:    2993,
-														},
-													},
-													Value: []byte("Quux"),
-												},
-											},
-										},
-									},
-								},
-								&ast.StmtTraitUseAlias{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 144,
-											EndLine:   144,
-											StartPos:  2995,
-											EndPos:    3010,
-										},
-									},
-									Ref: &ast.StmtTraitMethodRef{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 144,
-												EndLine:   144,
-												StartPos:  2995,
-												EndPos:    3003,
-											},
-										},
-										Trait: &ast.NameName{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 144,
-													EndLine:   144,
-													StartPos:  2995,
-													EndPos:    2998,
-												},
-											},
-											Parts: []ast.Vertex{
-												&ast.NameNamePart{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 144,
-															EndLine:   144,
-															StartPos:  2995,
-															EndPos:    2998,
-														},
-													},
-													Value: []byte("Baz"),
-												},
-											},
-										},
-										Method: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 144,
-													EndLine:   144,
-													StartPos:  3000,
-													EndPos:    3003,
-												},
-											},
-											Value: []byte("one"),
-										},
-									},
-									Alias: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 144,
-												EndLine:   144,
-												StartPos:  3007,
-												EndPos:    3010,
-											},
-										},
-										Value: []byte("two"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 146,
-						EndLine:   -1,
-						StartPos:  3017,
-						EndPos:    -1,
-					},
-				},
-				Stmts:   []ast.Vertex{},
-				Catches: []ast.Vertex{},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 147,
-						EndLine:   147,
-						StartPos:  3024,
-						EndPos:    3054,
-					},
-				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 147,
-								EndLine:   147,
-								StartPos:  3031,
-								EndPos:    3054,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 147,
-										EndLine:   147,
-										StartPos:  3038,
-										EndPos:    3047,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 147,
-												EndLine:   147,
-												StartPos:  3038,
-												EndPos:    3047,
-											},
-										},
-										Value: []byte("Exception"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 147,
-									EndLine:   147,
-									StartPos:  3048,
-									EndPos:    3050,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 147,
-										EndLine:   147,
-										StartPos:  3048,
-										EndPos:    3050,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 148,
-						EndLine:   148,
-						StartPos:  3055,
-						EndPos:    3116,
-					},
-				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 148,
-								EndLine:   148,
-								StartPos:  3062,
-								EndPos:    3085,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 148,
-										EndLine:   148,
-										StartPos:  3069,
-										EndPos:    3078,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 148,
-												EndLine:   148,
-												StartPos:  3069,
-												EndPos:    3078,
-											},
-										},
-										Value: []byte("Exception"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 148,
-									EndLine:   148,
-									StartPos:  3079,
-									EndPos:    3081,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 148,
-										EndLine:   148,
-										StartPos:  3079,
-										EndPos:    3081,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 148,
-								EndLine:   148,
-								StartPos:  3086,
-								EndPos:    3116,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 148,
-										EndLine:   148,
-										StartPos:  3093,
-										EndPos:    3109,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 148,
-												EndLine:   148,
-												StartPos:  3093,
-												EndPos:    3109,
-											},
-										},
-										Value: []byte("RuntimeException"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 148,
-									EndLine:   148,
-									StartPos:  3110,
-									EndPos:    3112,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 148,
-										EndLine:   148,
-										StartPos:  3110,
-										EndPos:    3112,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 149,
-						EndLine:   149,
-						StartPos:  3117,
-						EndPos:    3221,
-					},
-				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 149,
-								EndLine:   149,
-								StartPos:  3124,
-								EndPos:    3147,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 149,
-										EndLine:   149,
-										StartPos:  3131,
-										EndPos:    3140,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 149,
-												EndLine:   149,
-												StartPos:  3131,
-												EndPos:    3140,
-											},
-										},
-										Value: []byte("Exception"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 149,
-									EndLine:   149,
-									StartPos:  3141,
-									EndPos:    3143,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 149,
-										EndLine:   149,
-										StartPos:  3141,
-										EndPos:    3143,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 149,
-								EndLine:   149,
-								StartPos:  3148,
-								EndPos:    3179,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameFullyQualified{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 149,
-										EndLine:   149,
-										StartPos:  3155,
-										EndPos:    3172,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 149,
-												EndLine:   149,
-												StartPos:  3156,
-												EndPos:    3172,
-											},
-										},
-										Value: []byte("RuntimeException"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 149,
-									EndLine:   149,
-									StartPos:  3173,
-									EndPos:    3175,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 149,
-										EndLine:   149,
-										StartPos:  3173,
-										EndPos:    3175,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 149,
-								EndLine:   149,
-								StartPos:  3180,
-								EndPos:    3221,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameRelative{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 149,
-										EndLine:   149,
-										StartPos:  3187,
-										EndPos:    3214,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 149,
-												EndLine:   149,
-												StartPos:  3197,
-												EndPos:    3214,
-											},
-										},
-										Value: []byte("AdditionException"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 149,
-									EndLine:   149,
-									StartPos:  3215,
-									EndPos:    3217,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 149,
-										EndLine:   149,
-										StartPos:  3215,
-										EndPos:    3217,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-			},
-			&ast.StmtTry{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 150,
-						EndLine:   150,
-						StartPos:  3222,
-						EndPos:    3263,
-					},
-				},
-				Stmts: []ast.Vertex{},
-				Catches: []ast.Vertex{
-					&ast.StmtCatch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 150,
-								EndLine:   150,
-								StartPos:  3229,
-								EndPos:    3252,
-							},
-						},
-						Types: []ast.Vertex{
-							&ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 150,
-										EndLine:   150,
-										StartPos:  3236,
-										EndPos:    3245,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 150,
-												EndLine:   150,
-												StartPos:  3236,
-												EndPos:    3245,
-											},
-										},
-										Value: []byte("Exception"),
-									},
-								},
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 150,
-									EndLine:   150,
-									StartPos:  3246,
-									EndPos:    3248,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 150,
-										EndLine:   150,
-										StartPos:  3246,
-										EndPos:    3248,
-									},
-								},
-								Value: []byte("$e"),
-							},
-						},
-						Stmts: []ast.Vertex{},
-					},
-				},
-				Finally: &ast.StmtFinally{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 150,
-							EndLine:   150,
-							StartPos:  3253,
-							EndPos:    3263,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtUnset{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 152,
-						EndLine:   152,
-						StartPos:  3265,
-						EndPos:    3279,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 152,
-								EndLine:   152,
-								StartPos:  3271,
-								EndPos:    3273,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 152,
-									EndLine:   152,
-									StartPos:  3271,
-									EndPos:    3273,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					&ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 152,
-								EndLine:   152,
-								StartPos:  3275,
-								EndPos:    3277,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 152,
-									EndLine:   152,
-									StartPos:  3275,
-									EndPos:    3277,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 154,
-						EndLine:   154,
-						StartPos:  3281,
-						EndPos:    3289,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 154,
-								EndLine:   154,
-								StartPos:  3285,
-								EndPos:    3288,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 154,
-									EndLine:   154,
-									StartPos:  3285,
-									EndPos:    3288,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 154,
-											EndLine:   154,
-											StartPos:  3285,
-											EndPos:    3288,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 155,
-						EndLine:   155,
-						StartPos:  3290,
-						EndPos:    3299,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 155,
-								EndLine:   155,
-								StartPos:  3294,
-								EndPos:    3298,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 155,
-									EndLine:   155,
-									StartPos:  3295,
-									EndPos:    3298,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 155,
-											EndLine:   155,
-											StartPos:  3295,
-											EndPos:    3298,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 156,
-						EndLine:   156,
-						StartPos:  3300,
-						EndPos:    3316,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 156,
-								EndLine:   156,
-								StartPos:  3304,
-								EndPos:    3315,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 156,
-									EndLine:   156,
-									StartPos:  3305,
-									EndPos:    3308,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 156,
-											EndLine:   156,
-											StartPos:  3305,
-											EndPos:    3308,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 156,
-									EndLine:   156,
-									StartPos:  3312,
-									EndPos:    3315,
-								},
-							},
-							Value: []byte("Bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 157,
-						EndLine:   157,
-						StartPos:  3317,
-						EndPos:    3330,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 157,
-								EndLine:   157,
-								StartPos:  3321,
-								EndPos:    3324,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 157,
-									EndLine:   157,
-									StartPos:  3321,
-									EndPos:    3324,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 157,
-											EndLine:   157,
-											StartPos:  3321,
-											EndPos:    3324,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 157,
-								EndLine:   157,
-								StartPos:  3326,
-								EndPos:    3329,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 157,
-									EndLine:   157,
-									StartPos:  3326,
-									EndPos:    3329,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 157,
-											EndLine:   157,
-											StartPos:  3326,
-											EndPos:    3329,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 158,
-						EndLine:   158,
-						StartPos:  3331,
-						EndPos:    3351,
-					},
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 158,
-								EndLine:   158,
-								StartPos:  3335,
-								EndPos:    3338,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 158,
-									EndLine:   158,
-									StartPos:  3335,
-									EndPos:    3338,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 158,
-											EndLine:   158,
-											StartPos:  3335,
-											EndPos:    3338,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 158,
-								EndLine:   158,
-								StartPos:  3340,
-								EndPos:    3350,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 158,
-									EndLine:   158,
-									StartPos:  3340,
-									EndPos:    3343,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 158,
-											EndLine:   158,
-											StartPos:  3340,
-											EndPos:    3343,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 158,
-									EndLine:   158,
-									StartPos:  3347,
-									EndPos:    3350,
-								},
-							},
-							Value: []byte("Baz"),
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 159,
-						EndLine:   159,
-						StartPos:  3352,
-						EndPos:    3375,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 159,
-							EndLine:   159,
-							StartPos:  3356,
-							EndPos:    3364,
-						},
-					},
-					Value: []byte("function"),
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 159,
-								EndLine:   159,
-								StartPos:  3365,
-								EndPos:    3368,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 159,
-									EndLine:   159,
-									StartPos:  3365,
-									EndPos:    3368,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 159,
-											EndLine:   159,
-											StartPos:  3365,
-											EndPos:    3368,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 159,
-								EndLine:   159,
-								StartPos:  3370,
-								EndPos:    3374,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 159,
-									EndLine:   159,
-									StartPos:  3371,
-									EndPos:    3374,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 159,
-											EndLine:   159,
-											StartPos:  3371,
-											EndPos:    3374,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 160,
-						EndLine:   160,
-						StartPos:  3376,
-						EndPos:    3413,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 160,
-							EndLine:   160,
-							StartPos:  3380,
-							EndPos:    3388,
-						},
-					},
-					Value: []byte("function"),
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 160,
-								EndLine:   160,
-								StartPos:  3389,
-								EndPos:    3399,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 160,
-									EndLine:   160,
-									StartPos:  3389,
-									EndPos:    3392,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 160,
-											EndLine:   160,
-											StartPos:  3389,
-											EndPos:    3392,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 160,
-									EndLine:   160,
-									StartPos:  3396,
-									EndPos:    3399,
-								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 160,
-								EndLine:   160,
-								StartPos:  3401,
-								EndPos:    3412,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 160,
-									EndLine:   160,
-									StartPos:  3402,
-									EndPos:    3405,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 160,
-											EndLine:   160,
-											StartPos:  3402,
-											EndPos:    3405,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 160,
-									EndLine:   160,
-									StartPos:  3409,
-									EndPos:    3412,
-								},
-							},
-							Value: []byte("bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 161,
-						EndLine:   161,
-						StartPos:  3414,
-						EndPos:    3434,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 161,
-							EndLine:   161,
-							StartPos:  3418,
-							EndPos:    3423,
-						},
-					},
-					Value: []byte("const"),
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 161,
-								EndLine:   161,
-								StartPos:  3424,
-								EndPos:    3427,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 161,
-									EndLine:   161,
-									StartPos:  3424,
-									EndPos:    3427,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 161,
-											EndLine:   161,
-											StartPos:  3424,
-											EndPos:    3427,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 161,
-								EndLine:   161,
-								StartPos:  3429,
-								EndPos:    3433,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 161,
-									EndLine:   161,
-									StartPos:  3430,
-									EndPos:    3433,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 161,
-											EndLine:   161,
-											StartPos:  3430,
-											EndPos:    3433,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtUse{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 162,
-						EndLine:   162,
-						StartPos:  3435,
-						EndPos:    3469,
-					},
-				},
-				Type: &ast.Identifier{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 162,
-							EndLine:   162,
-							StartPos:  3439,
-							EndPos:    3444,
-						},
-					},
-					Value: []byte("const"),
-				},
-				UseDeclarations: []ast.Vertex{
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 162,
-								EndLine:   162,
-								StartPos:  3445,
-								EndPos:    3455,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3445,
-									EndPos:    3448,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 162,
-											EndLine:   162,
-											StartPos:  3445,
-											EndPos:    3448,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3452,
-									EndPos:    3455,
-								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					&ast.StmtUseDeclaration{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 162,
-								EndLine:   162,
-								StartPos:  3457,
-								EndPos:    3468,
-							},
-						},
-						Use: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3458,
-									EndPos:    3461,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 162,
-											EndLine:   162,
-											StartPos:  3458,
-											EndPos:    3461,
-										},
-									},
-									Value: []byte("Bar"),
-								},
-							},
-						},
-						Alias: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 162,
-									EndLine:   162,
-									StartPos:  3465,
-									EndPos:    3468,
-								},
-							},
-							Value: []byte("bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 164,
-						EndLine:   164,
-						StartPos:  3471,
-						EndPos:    3477,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 164,
-							EndLine:   164,
-							StartPos:  3471,
-							EndPos:    3476,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 164,
-								EndLine:   164,
-								StartPos:  3471,
-								EndPos:    3473,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 164,
-									EndLine:   164,
-									StartPos:  3471,
-									EndPos:    3473,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 164,
-								EndLine:   164,
-								StartPos:  3474,
-								EndPos:    3475,
-							},
-						},
-						Value: []byte("1"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 165,
-						EndLine:   165,
-						StartPos:  3478,
-						EndPos:    3487,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 165,
-							EndLine:   165,
-							StartPos:  3478,
-							EndPos:    3486,
-						},
-					},
-					Var: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 165,
-								EndLine:   165,
-								StartPos:  3478,
-								EndPos:    3483,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 165,
-									EndLine:   165,
-									StartPos:  3478,
-									EndPos:    3480,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 165,
-										EndLine:   165,
-										StartPos:  3478,
-										EndPos:    3480,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 165,
-									EndLine:   165,
-									StartPos:  3481,
-									EndPos:    3482,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 165,
-								EndLine:   165,
-								StartPos:  3484,
-								EndPos:    3485,
-							},
-						},
-						Value: []byte("2"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 166,
-						EndLine:   166,
-						StartPos:  3488,
-						EndPos:    3496,
-					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 166,
-							EndLine:   166,
-							StartPos:  3488,
-							EndPos:    3495,
-						},
-					},
-					Items: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 167,
-						EndLine:   167,
-						StartPos:  3497,
-						EndPos:    3506,
-					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 167,
-							EndLine:   167,
-							StartPos:  3497,
-							EndPos:    3505,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 167,
-									EndLine:   167,
-									StartPos:  3503,
-									EndPos:    3504,
-								},
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 167,
-										EndLine:   167,
-										StartPos:  3503,
-										EndPos:    3504,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 168,
-						EndLine:   168,
-						StartPos:  3507,
-						EndPos:    3525,
-					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 168,
-							EndLine:   168,
-							StartPos:  3507,
-							EndPos:    3524,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 168,
-									EndLine:   168,
-									StartPos:  3513,
-									EndPos:    3517,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 168,
-										EndLine:   168,
-										StartPos:  3513,
-										EndPos:    3514,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 168,
-										EndLine:   168,
-										StartPos:  3516,
-										EndPos:    3517,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 168,
-									EndLine:   168,
-									StartPos:  3519,
-									EndPos:    3522,
-								},
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 168,
-										EndLine:   168,
-										StartPos:  3519,
-										EndPos:    3522,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 168,
-											EndLine:   168,
-											StartPos:  3520,
-											EndPos:    3522,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 168,
-												EndLine:   168,
-												StartPos:  3520,
-												EndPos:    3522,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-						&ast.ExprArrayItem{},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 169,
-						EndLine:   169,
-						StartPos:  3526,
-						EndPos:    3541,
-					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 169,
-							EndLine:   169,
-							StartPos:  3526,
-							EndPos:    3540,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 169,
-									EndLine:   169,
-									StartPos:  3532,
-									EndPos:    3539,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 169,
-										EndLine:   169,
-										StartPos:  3532,
-										EndPos:    3533,
-									},
-								},
-								Value: []byte("3"),
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 169,
-										EndLine:   169,
-										StartPos:  3536,
-										EndPos:    3539,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 169,
-											EndLine:   169,
-											StartPos:  3537,
-											EndPos:    3539,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 169,
-												EndLine:   169,
-												StartPos:  3537,
-												EndPos:    3539,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 170,
-						EndLine:   170,
-						StartPos:  3542,
-						EndPos:    3571,
-					},
-				},
-				Expr: &ast.ExprArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 170,
-							EndLine:   170,
-							StartPos:  3542,
-							EndPos:    3570,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 170,
-									EndLine:   170,
-									StartPos:  3548,
-									EndPos:    3551,
-								},
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 170,
-										EndLine:   170,
-										StartPos:  3548,
-										EndPos:    3551,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 170,
-											EndLine:   170,
-											StartPos:  3549,
-											EndPos:    3551,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 170,
-												EndLine:   170,
-												StartPos:  3549,
-												EndPos:    3551,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 170,
-									EndLine:   170,
-									StartPos:  3553,
-									EndPos:    3557,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 170,
-										EndLine:   170,
-										StartPos:  3553,
-										EndPos:    3554,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 170,
-										EndLine:   170,
-										StartPos:  3556,
-										EndPos:    3557,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 170,
-									EndLine:   170,
-									StartPos:  3559,
-									EndPos:    3560,
-								},
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 170,
-										EndLine:   170,
-										StartPos:  3559,
-										EndPos:    3560,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 170,
-									EndLine:   170,
-									StartPos:  3562,
-									EndPos:    3569,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 170,
-										EndLine:   170,
-										StartPos:  3562,
-										EndPos:    3563,
-									},
-								},
-								Value: []byte("3"),
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 170,
-										EndLine:   170,
-										StartPos:  3566,
-										EndPos:    3569,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 170,
-											EndLine:   170,
-											StartPos:  3567,
-											EndPos:    3569,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 170,
-												EndLine:   170,
-												StartPos:  3567,
-												EndPos:    3569,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 171,
-						EndLine:   171,
-						StartPos:  3572,
-						EndPos:    3576,
-					},
-				},
-				Expr: &ast.ExprBitwiseNot{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 171,
-							EndLine:   171,
-							StartPos:  3572,
-							EndPos:    3575,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 171,
-								EndLine:   171,
-								StartPos:  3573,
-								EndPos:    3575,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 171,
-									EndLine:   171,
-									StartPos:  3573,
-									EndPos:    3575,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 172,
-						EndLine:   172,
-						StartPos:  3577,
-						EndPos:    3581,
-					},
-				},
-				Expr: &ast.ExprBooleanNot{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 172,
-							EndLine:   172,
-							StartPos:  3577,
-							EndPos:    3580,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 172,
-								EndLine:   172,
-								StartPos:  3578,
-								EndPos:    3580,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 172,
-									EndLine:   172,
-									StartPos:  3578,
-									EndPos:    3580,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 174,
-						EndLine:   174,
-						StartPos:  3583,
-						EndPos:    3592,
-					},
-				},
-				Expr: &ast.ExprClassConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 174,
-							EndLine:   174,
-							StartPos:  3583,
-							EndPos:    3591,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 174,
-								EndLine:   174,
-								StartPos:  3583,
-								EndPos:    3586,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 174,
-										EndLine:   174,
-										StartPos:  3583,
-										EndPos:    3586,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					ConstantName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 174,
-								EndLine:   174,
-								StartPos:  3588,
-								EndPos:    3591,
-							},
-						},
-						Value: []byte("Bar"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 175,
-						EndLine:   175,
-						StartPos:  3593,
-						EndPos:    3603,
-					},
-				},
-				Expr: &ast.ExprClone{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 175,
-							EndLine:   175,
-							StartPos:  3593,
-							EndPos:    3602,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 175,
-								EndLine:   175,
-								StartPos:  3599,
-								EndPos:    3601,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 175,
-									EndLine:   175,
-									StartPos:  3599,
-									EndPos:    3601,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 176,
-						EndLine:   176,
-						StartPos:  3604,
-						EndPos:    3613,
-					},
-				},
-				Expr: &ast.ExprClone{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 176,
-							EndLine:   176,
-							StartPos:  3604,
-							EndPos:    3612,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 176,
-								EndLine:   176,
-								StartPos:  3610,
-								EndPos:    3612,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 176,
-									EndLine:   176,
-									StartPos:  3610,
-									EndPos:    3612,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 177,
-						EndLine:   177,
-						StartPos:  3614,
-						EndPos:    3627,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 177,
-							EndLine:   177,
-							StartPos:  3614,
-							EndPos:    3626,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 178,
-						EndLine:   178,
-						StartPos:  3628,
-						EndPos:    3662,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 178,
-							EndLine:   178,
-							StartPos:  3628,
-							EndPos:    3661,
-						},
-					},
-					Params: []ast.Vertex{
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 178,
-									EndLine:   178,
-									StartPos:  3637,
-									EndPos:    3639,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 178,
-										EndLine:   178,
-										StartPos:  3637,
-										EndPos:    3639,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 178,
-											EndLine:   178,
-											StartPos:  3637,
-											EndPos:    3639,
-										},
-									},
-									Value: []byte("$a"),
-								},
-							},
-						},
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 178,
-									EndLine:   178,
-									StartPos:  3641,
-									EndPos:    3643,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 178,
-										EndLine:   178,
-										StartPos:  3641,
-										EndPos:    3643,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 178,
-											EndLine:   178,
-											StartPos:  3641,
-											EndPos:    3643,
-										},
-									},
-									Value: []byte("$b"),
-								},
-							},
-						},
-					},
-					ClosureUse: &ast.ExprClosureUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 178,
-								EndLine:   178,
-								StartPos:  3645,
-								EndPos:    3658,
-							},
-						},
-						Uses: []ast.Vertex{
-							&ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 178,
-										EndLine:   178,
-										StartPos:  3650,
-										EndPos:    3652,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 178,
-											EndLine:   178,
-											StartPos:  3650,
-											EndPos:    3652,
-										},
-									},
-									Value: []byte("$c"),
-								},
-							},
-							&ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 178,
-										EndLine:   178,
-										StartPos:  3654,
-										EndPos:    3657,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 178,
-											EndLine:   178,
-											StartPos:  3655,
-											EndPos:    3657,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 178,
-												EndLine:   178,
-												StartPos:  3655,
-												EndPos:    3657,
-											},
-										},
-										Value: []byte("$d"),
-									},
-								},
-							},
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 179,
-						EndLine:   179,
-						StartPos:  3663,
-						EndPos:    3697,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 179,
-							EndLine:   179,
-							StartPos:  3663,
-							EndPos:    3696,
-						},
-					},
-					Params: []ast.Vertex{
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 179,
-									EndLine:   179,
-									StartPos:  3672,
-									EndPos:    3674,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 179,
-										EndLine:   179,
-										StartPos:  3672,
-										EndPos:    3674,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 179,
-											EndLine:   179,
-											StartPos:  3672,
-											EndPos:    3674,
-										},
-									},
-									Value: []byte("$a"),
-								},
-							},
-						},
-						&ast.Parameter{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 179,
-									EndLine:   179,
-									StartPos:  3676,
-									EndPos:    3678,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 179,
-										EndLine:   179,
-										StartPos:  3676,
-										EndPos:    3678,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 179,
-											EndLine:   179,
-											StartPos:  3676,
-											EndPos:    3678,
-										},
-									},
-									Value: []byte("$b"),
-								},
-							},
-						},
-					},
-					ClosureUse: &ast.ExprClosureUse{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 179,
-								EndLine:   179,
-								StartPos:  3680,
-								EndPos:    3693,
-							},
-						},
-						Uses: []ast.Vertex{
-							&ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 179,
-										EndLine:   179,
-										StartPos:  3685,
-										EndPos:    3688,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 179,
-											EndLine:   179,
-											StartPos:  3686,
-											EndPos:    3688,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 179,
-												EndLine:   179,
-												StartPos:  3686,
-												EndPos:    3688,
-											},
-										},
-										Value: []byte("$c"),
-									},
-								},
-							},
-							&ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 179,
-										EndLine:   179,
-										StartPos:  3690,
-										EndPos:    3692,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 179,
-											EndLine:   179,
-											StartPos:  3690,
-											EndPos:    3692,
-										},
-									},
-									Value: []byte("$d"),
-								},
-							},
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 180,
-						EndLine:   180,
-						StartPos:  3698,
-						EndPos:    3712,
-					},
-				},
-				Expr: &ast.ExprClosure{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 180,
-							EndLine:   180,
-							StartPos:  3698,
-							EndPos:    3711,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 181,
-						EndLine:   181,
-						StartPos:  3713,
-						EndPos:    3717,
-					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 181,
-							EndLine:   181,
-							StartPos:  3713,
-							EndPos:    3716,
-						},
-					},
-					Const: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 181,
-								EndLine:   181,
-								StartPos:  3713,
-								EndPos:    3716,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 181,
-										EndLine:   181,
-										StartPos:  3713,
-										EndPos:    3716,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 182,
-						EndLine:   182,
-						StartPos:  3718,
-						EndPos:    3732,
-					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 182,
-							EndLine:   182,
-							StartPos:  3718,
-							EndPos:    3731,
-						},
-					},
-					Const: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 182,
-								EndLine:   182,
-								StartPos:  3718,
-								EndPos:    3731,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 182,
-										EndLine:   182,
-										StartPos:  3728,
-										EndPos:    3731,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 183,
-						EndLine:   183,
-						StartPos:  3733,
-						EndPos:    3738,
-					},
-				},
-				Expr: &ast.ExprConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 183,
-							EndLine:   183,
-							StartPos:  3733,
-							EndPos:    3737,
-						},
-					},
-					Const: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 183,
-								EndLine:   183,
-								StartPos:  3733,
-								EndPos:    3737,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 183,
-										EndLine:   183,
-										StartPos:  3734,
-										EndPos:    3737,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 185,
-						EndLine:   185,
-						StartPos:  3740,
-						EndPos:    3750,
-					},
-				},
-				Expr: &ast.ExprEmpty{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 185,
-							EndLine:   185,
-							StartPos:  3740,
-							EndPos:    3749,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 185,
-								EndLine:   185,
-								StartPos:  3746,
-								EndPos:    3748,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 185,
-									EndLine:   185,
-									StartPos:  3746,
-									EndPos:    3748,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 186,
-						EndLine:   186,
-						StartPos:  3751,
-						EndPos:    3762,
-					},
-				},
-				Expr: &ast.ExprEmpty{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 186,
-							EndLine:   186,
-							StartPos:  3751,
-							EndPos:    3761,
-						},
-					},
-					Expr: &ast.ExprConstFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 186,
-								EndLine:   186,
-								StartPos:  3757,
-								EndPos:    3760,
-							},
-						},
-						Const: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 186,
-									EndLine:   186,
-									StartPos:  3757,
-									EndPos:    3760,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 186,
-											EndLine:   186,
-											StartPos:  3757,
-											EndPos:    3760,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 187,
-						EndLine:   187,
-						StartPos:  3763,
-						EndPos:    3767,
-					},
-				},
-				Expr: &ast.ExprErrorSuppress{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 187,
-							EndLine:   187,
-							StartPos:  3763,
-							EndPos:    3766,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 187,
-								EndLine:   187,
-								StartPos:  3764,
-								EndPos:    3766,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 187,
-									EndLine:   187,
-									StartPos:  3764,
-									EndPos:    3766,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 188,
-						EndLine:   188,
-						StartPos:  3768,
-						EndPos:    3777,
-					},
-				},
-				Expr: &ast.ExprEval{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 188,
-							EndLine:   188,
-							StartPos:  3768,
-							EndPos:    3776,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 188,
-								EndLine:   188,
-								StartPos:  3773,
-								EndPos:    3775,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 188,
-									EndLine:   188,
-									StartPos:  3773,
-									EndPos:    3775,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 189,
-						EndLine:   189,
-						StartPos:  3778,
-						EndPos:    3783,
-					},
-				},
-				Expr: &ast.ExprExit{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 189,
-							EndLine:   189,
-							StartPos:  3778,
-							EndPos:    3782,
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 190,
-						EndLine:   190,
-						StartPos:  3784,
-						EndPos:    3793,
-					},
-				},
-				Expr: &ast.ExprExit{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 190,
-							EndLine:   190,
-							StartPos:  3784,
-							EndPos:    3792,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 190,
-								EndLine:   190,
-								StartPos:  3789,
-								EndPos:    3791,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 190,
-									EndLine:   190,
-									StartPos:  3789,
-									EndPos:    3791,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 191,
-						EndLine:   191,
-						StartPos:  3794,
-						EndPos:    3800,
-					},
-				},
-				Expr: &ast.ExprExit{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 191,
-							EndLine:   191,
-							StartPos:  3794,
-							EndPos:    3799,
-						},
-					},
-					Die: true,
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 192,
-						EndLine:   192,
-						StartPos:  3801,
-						EndPos:    3809,
-					},
-				},
-				Expr: &ast.ExprExit{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 192,
-							EndLine:   192,
-							StartPos:  3801,
-							EndPos:    3808,
-						},
-					},
-					Die: true,
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 192,
-								EndLine:   192,
-								StartPos:  3805,
-								EndPos:    3807,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 192,
-									EndLine:   192,
-									StartPos:  3805,
-									EndPos:    3807,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 193,
-						EndLine:   193,
-						StartPos:  3810,
-						EndPos:    3816,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 193,
-							EndLine:   193,
-							StartPos:  3810,
-							EndPos:    3815,
-						},
-					},
-					Function: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 193,
-								EndLine:   193,
-								StartPos:  3810,
-								EndPos:    3813,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 193,
-										EndLine:   193,
-										StartPos:  3810,
-										EndPos:    3813,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 193,
-								EndLine:   193,
-								StartPos:  3813,
-								EndPos:    3815,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 194,
-						EndLine:   194,
-						StartPos:  3817,
-						EndPos:    3836,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 194,
-							EndLine:   194,
-							StartPos:  3817,
-							EndPos:    3835,
-						},
-					},
-					Function: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 194,
-								EndLine:   194,
-								StartPos:  3817,
-								EndPos:    3830,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 194,
-										EndLine:   194,
-										StartPos:  3827,
-										EndPos:    3830,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 194,
-								EndLine:   194,
-								StartPos:  3830,
-								EndPos:    3835,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 194,
-										EndLine:   194,
-										StartPos:  3832,
-										EndPos:    3834,
-									},
-								},
-								IsReference: true,
-								Expr: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 194,
-											EndLine:   194,
-											StartPos:  3832,
-											EndPos:    3834,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 194,
-												EndLine:   194,
-												StartPos:  3832,
-												EndPos:    3834,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 195,
-						EndLine:   195,
-						StartPos:  3837,
-						EndPos:    3846,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 195,
-							EndLine:   195,
-							StartPos:  3837,
-							EndPos:    3845,
-						},
-					},
-					Function: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 195,
-								EndLine:   195,
-								StartPos:  3837,
-								EndPos:    3841,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 195,
-										EndLine:   195,
-										StartPos:  3838,
-										EndPos:    3841,
-									},
-								},
-								Value: []byte("foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 195,
-								EndLine:   195,
-								StartPos:  3841,
-								EndPos:    3845,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 195,
-										EndLine:   195,
-										StartPos:  3842,
-										EndPos:    3844,
-									},
-								},
-								Expr: &ast.ExprShortArray{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 195,
-											EndLine:   195,
-											StartPos:  3842,
-											EndPos:    3844,
-										},
-									},
-									Items: []ast.Vertex{},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 196,
-						EndLine:   196,
-						StartPos:  3847,
-						EndPos:    3862,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 196,
-							EndLine:   196,
-							StartPos:  3847,
-							EndPos:    3861,
-						},
-					},
-					Function: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 196,
-								EndLine:   196,
-								StartPos:  3847,
-								EndPos:    3851,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 196,
-									EndLine:   196,
-									StartPos:  3847,
-									EndPos:    3851,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 196,
-								EndLine:   196,
-								StartPos:  3851,
-								EndPos:    3861,
-							},
-						},
-						Arguments: []ast.Vertex{
-							&ast.Argument{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 196,
-										EndLine:   196,
-										StartPos:  3852,
-										EndPos:    3860,
-									},
-								},
-								Expr: &ast.ExprYield{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 196,
-											EndLine:   196,
-											StartPos:  3852,
-											EndPos:    3860,
-										},
-									},
-									Value: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 196,
-												EndLine:   196,
-												StartPos:  3858,
-												EndPos:    3860,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 196,
-													EndLine:   196,
-													StartPos:  3858,
-													EndPos:    3860,
-												},
-											},
-											Value: []byte("$a"),
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 198,
-						EndLine:   198,
-						StartPos:  3864,
-						EndPos:    3869,
-					},
-				},
-				Expr: &ast.ExprPostDec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 198,
-							EndLine:   198,
-							StartPos:  3864,
-							EndPos:    3868,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 198,
-								EndLine:   198,
-								StartPos:  3864,
-								EndPos:    3866,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 198,
-									EndLine:   198,
-									StartPos:  3864,
-									EndPos:    3866,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 199,
-						EndLine:   199,
-						StartPos:  3870,
-						EndPos:    3875,
-					},
-				},
-				Expr: &ast.ExprPostInc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 199,
-							EndLine:   199,
-							StartPos:  3870,
-							EndPos:    3874,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 199,
-								EndLine:   199,
-								StartPos:  3870,
-								EndPos:    3872,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 199,
-									EndLine:   199,
-									StartPos:  3870,
-									EndPos:    3872,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 200,
-						EndLine:   200,
-						StartPos:  3876,
-						EndPos:    3881,
-					},
-				},
-				Expr: &ast.ExprPreDec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 200,
-							EndLine:   200,
-							StartPos:  3876,
-							EndPos:    3880,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 200,
-								EndLine:   200,
-								StartPos:  3878,
-								EndPos:    3880,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 200,
-									EndLine:   200,
-									StartPos:  3878,
-									EndPos:    3880,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 201,
-						EndLine:   201,
-						StartPos:  3882,
-						EndPos:    3887,
-					},
-				},
-				Expr: &ast.ExprPreInc{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 201,
-							EndLine:   201,
-							StartPos:  3882,
-							EndPos:    3886,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 201,
-								EndLine:   201,
-								StartPos:  3884,
-								EndPos:    3886,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 201,
-									EndLine:   201,
-									StartPos:  3884,
-									EndPos:    3886,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 203,
-						EndLine:   203,
-						StartPos:  3889,
-						EndPos:    3900,
-					},
-				},
-				Expr: &ast.ExprInclude{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 203,
-							EndLine:   203,
-							StartPos:  3889,
-							EndPos:    3899,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 203,
-								EndLine:   203,
-								StartPos:  3897,
-								EndPos:    3899,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 203,
-									EndLine:   203,
-									StartPos:  3897,
-									EndPos:    3899,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 204,
-						EndLine:   204,
-						StartPos:  3901,
-						EndPos:    3917,
-					},
-				},
-				Expr: &ast.ExprIncludeOnce{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 204,
-							EndLine:   204,
-							StartPos:  3901,
-							EndPos:    3916,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 204,
-								EndLine:   204,
-								StartPos:  3914,
-								EndPos:    3916,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 204,
-									EndLine:   204,
-									StartPos:  3914,
-									EndPos:    3916,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 205,
-						EndLine:   205,
-						StartPos:  3918,
-						EndPos:    3929,
-					},
-				},
-				Expr: &ast.ExprRequire{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 205,
-							EndLine:   205,
-							StartPos:  3918,
-							EndPos:    3928,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 205,
-								EndLine:   205,
-								StartPos:  3926,
-								EndPos:    3928,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 205,
-									EndLine:   205,
-									StartPos:  3926,
-									EndPos:    3928,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 206,
-						EndLine:   206,
-						StartPos:  3930,
-						EndPos:    3946,
-					},
-				},
-				Expr: &ast.ExprRequireOnce{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 206,
-							EndLine:   206,
-							StartPos:  3930,
-							EndPos:    3945,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 206,
-								EndLine:   206,
-								StartPos:  3943,
-								EndPos:    3945,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 206,
-									EndLine:   206,
-									StartPos:  3943,
-									EndPos:    3945,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 208,
-						EndLine:   208,
-						StartPos:  3948,
-						EndPos:    3966,
-					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 208,
-							EndLine:   208,
-							StartPos:  3948,
-							EndPos:    3965,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 208,
-								EndLine:   208,
-								StartPos:  3948,
-								EndPos:    3950,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 208,
-									EndLine:   208,
-									StartPos:  3948,
-									EndPos:    3950,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 208,
-								EndLine:   208,
-								StartPos:  3962,
-								EndPos:    3965,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 208,
-										EndLine:   208,
-										StartPos:  3962,
-										EndPos:    3965,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 209,
-						EndLine:   209,
-						StartPos:  3967,
-						EndPos:    3995,
-					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 209,
-							EndLine:   209,
-							StartPos:  3967,
-							EndPos:    3994,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 209,
-								EndLine:   209,
-								StartPos:  3967,
-								EndPos:    3969,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 209,
-									EndLine:   209,
-									StartPos:  3967,
-									EndPos:    3969,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 209,
-								EndLine:   209,
-								StartPos:  3981,
-								EndPos:    3994,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 209,
-										EndLine:   209,
-										StartPos:  3991,
-										EndPos:    3994,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 210,
-						EndLine:   210,
-						StartPos:  3996,
-						EndPos:    4015,
-					},
-				},
-				Expr: &ast.ExprInstanceOf{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 210,
-							EndLine:   210,
-							StartPos:  3996,
-							EndPos:    4014,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 210,
-								EndLine:   210,
-								StartPos:  3996,
-								EndPos:    3998,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 210,
-									EndLine:   210,
-									StartPos:  3996,
-									EndPos:    3998,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 210,
-								EndLine:   210,
-								StartPos:  4010,
-								EndPos:    4014,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 210,
-										EndLine:   210,
-										StartPos:  4011,
-										EndPos:    4014,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 212,
-						EndLine:   212,
-						StartPos:  4017,
-						EndPos:    4031,
-					},
-				},
-				Expr: &ast.ExprIsset{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 212,
-							EndLine:   212,
-							StartPos:  4017,
-							EndPos:    4030,
-						},
-					},
-					Vars: []ast.Vertex{
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 212,
-									EndLine:   212,
-									StartPos:  4023,
-									EndPos:    4025,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 212,
-										EndLine:   212,
-										StartPos:  4023,
-										EndPos:    4025,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 212,
-									EndLine:   212,
-									StartPos:  4027,
-									EndPos:    4029,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 212,
-										EndLine:   212,
-										StartPos:  4027,
-										EndPos:    4029,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 213,
-						EndLine:   213,
-						StartPos:  4032,
-						EndPos:    4043,
-					},
-				},
-				Expr: &ast.ExprIsset{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 213,
-							EndLine:   213,
-							StartPos:  4032,
-							EndPos:    4042,
-						},
-					},
-					Vars: []ast.Vertex{
-						&ast.ExprConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 213,
-									EndLine:   213,
-									StartPos:  4038,
-									EndPos:    4041,
-								},
-							},
-							Const: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 213,
-										EndLine:   213,
-										StartPos:  4038,
-										EndPos:    4041,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 213,
-												EndLine:   213,
-												StartPos:  4038,
-												EndPos:    4041,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 214,
-						EndLine:   214,
-						StartPos:  4044,
-						EndPos:    4056,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 214,
-							EndLine:   214,
-							StartPos:  4044,
-							EndPos:    4055,
-						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 214,
-								EndLine:   214,
-								StartPos:  4044,
-								EndPos:    4050,
-							},
-						},
-						Items: []ast.Vertex{},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 214,
-								EndLine:   214,
-								StartPos:  4053,
-								EndPos:    4055,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 214,
-									EndLine:   214,
-									StartPos:  4053,
-									EndPos:    4055,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 215,
-						EndLine:   215,
-						StartPos:  4057,
-						EndPos:    4075,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 215,
-							EndLine:   215,
-							StartPos:  4057,
-							EndPos:    4074,
-						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 215,
-								EndLine:   215,
-								StartPos:  4057,
-								EndPos:    4069,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 215,
-										EndLine:   215,
-										StartPos:  4062,
-										EndPos:    4064,
-									},
-								},
-								Val: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 215,
-											EndLine:   215,
-											StartPos:  4062,
-											EndPos:    4064,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 215,
-												EndLine:   215,
-												StartPos:  4062,
-												EndPos:    4064,
-											},
-										},
-										Value: []byte("$a"),
-									},
-								},
-							},
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 215,
-										EndLine:   215,
-										StartPos:  4066,
-										EndPos:    4068,
-									},
-								},
-								Val: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 215,
-											EndLine:   215,
-											StartPos:  4066,
-											EndPos:    4068,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 215,
-												EndLine:   215,
-												StartPos:  4066,
-												EndPos:    4068,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 215,
-								EndLine:   215,
-								StartPos:  4072,
-								EndPos:    4074,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 215,
-									EndLine:   215,
-									StartPos:  4072,
-									EndPos:    4074,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 216,
-						EndLine:   216,
-						StartPos:  4076,
-						EndPos:    4092,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 216,
-							EndLine:   216,
-							StartPos:  4076,
-							EndPos:    4091,
-						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 216,
-								EndLine:   216,
-								StartPos:  4076,
-								EndPos:    4086,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 216,
-										EndLine:   216,
-										StartPos:  4081,
-										EndPos:    4085,
-									},
-								},
-								Val: &ast.ExprArrayDimFetch{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 216,
-											EndLine:   216,
-											StartPos:  4081,
-											EndPos:    4085,
-										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 216,
-												EndLine:   216,
-												StartPos:  4081,
-												EndPos:    4083,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 216,
-													EndLine:   216,
-													StartPos:  4081,
-													EndPos:    4083,
-												},
-											},
-											Value: []byte("$a"),
-										},
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 216,
-								EndLine:   216,
-								StartPos:  4089,
-								EndPos:    4091,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 216,
-									EndLine:   216,
-									StartPos:  4089,
-									EndPos:    4091,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 217,
-						EndLine:   217,
-						StartPos:  4093,
-						EndPos:    4113,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 217,
-							EndLine:   217,
-							StartPos:  4093,
-							EndPos:    4112,
-						},
-					},
-					Var: &ast.ExprList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 217,
-								EndLine:   217,
-								StartPos:  4093,
-								EndPos:    4107,
-							},
-						},
-						Items: []ast.Vertex{
-							&ast.ExprArrayItem{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 217,
-										EndLine:   217,
-										StartPos:  4098,
-										EndPos:    4106,
-									},
-								},
-								Val: &ast.ExprList{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 217,
-											EndLine:   217,
-											StartPos:  4098,
-											EndPos:    4106,
-										},
-									},
-									Items: []ast.Vertex{
-										&ast.ExprArrayItem{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 217,
-													EndLine:   217,
-													StartPos:  4103,
-													EndPos:    4105,
-												},
-											},
-											Val: &ast.ExprVariable{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 217,
-														EndLine:   217,
-														StartPos:  4103,
-														EndPos:    4105,
-													},
-												},
-												VarName: &ast.Identifier{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 217,
-															EndLine:   217,
-															StartPos:  4103,
-															EndPos:    4105,
-														},
-													},
-													Value: []byte("$a"),
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 217,
-								EndLine:   217,
-								StartPos:  4110,
-								EndPos:    4112,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 217,
-									EndLine:   217,
-									StartPos:  4110,
-									EndPos:    4112,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 219,
-						EndLine:   219,
-						StartPos:  4115,
-						EndPos:    4125,
-					},
-				},
-				Expr: &ast.ExprMethodCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 219,
-							EndLine:   219,
-							StartPos:  4115,
-							EndPos:    4124,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 219,
-								EndLine:   219,
-								StartPos:  4115,
-								EndPos:    4117,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 219,
-									EndLine:   219,
-									StartPos:  4115,
-									EndPos:    4117,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Method: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 219,
-								EndLine:   219,
-								StartPos:  4119,
-								EndPos:    4122,
-							},
-						},
-						Value: []byte("foo"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 219,
-								EndLine:   219,
-								StartPos:  4122,
-								EndPos:    4124,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 220,
-						EndLine:   220,
-						StartPos:  4126,
-						EndPos:    4134,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 220,
-							EndLine:   220,
-							StartPos:  4126,
-							EndPos:    4133,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 220,
-								EndLine:   220,
-								StartPos:  4130,
-								EndPos:    4133,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 220,
-										EndLine:   220,
-										StartPos:  4130,
-										EndPos:    4133,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 221,
-						EndLine:   221,
-						StartPos:  4135,
-						EndPos:    4155,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 221,
-							EndLine:   221,
-							StartPos:  4135,
-							EndPos:    4154,
-						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 221,
-								EndLine:   221,
-								StartPos:  4139,
-								EndPos:    4152,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 221,
-										EndLine:   221,
-										StartPos:  4149,
-										EndPos:    4152,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 221,
-								EndLine:   221,
-								StartPos:  4152,
-								EndPos:    4154,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 222,
-						EndLine:   222,
-						StartPos:  4156,
-						EndPos:    4167,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 222,
-							EndLine:   222,
-							StartPos:  4156,
-							EndPos:    4166,
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 222,
-								EndLine:   222,
-								StartPos:  4160,
-								EndPos:    4164,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 222,
-										EndLine:   222,
-										StartPos:  4161,
-										EndPos:    4164,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 222,
-								EndLine:   222,
-								StartPos:  4164,
-								EndPos:    4166,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 223,
-						EndLine:   223,
-						StartPos:  4168,
-						EndPos:    4178,
-					},
-				},
-				Expr: &ast.ExprPrint{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 223,
-							EndLine:   223,
-							StartPos:  4168,
-							EndPos:    4177,
-						},
-					},
-					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("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 224,
-						EndLine:   224,
-						StartPos:  4179,
-						EndPos:    4187,
-					},
-				},
-				Expr: &ast.ExprPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 224,
-							EndLine:   224,
-							StartPos:  4179,
-							EndPos:    4186,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 224,
-								EndLine:   224,
-								StartPos:  4179,
-								EndPos:    4181,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 224,
-									EndLine:   224,
-									StartPos:  4179,
-									EndPos:    4181,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Property: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 224,
-								EndLine:   224,
-								StartPos:  4183,
-								EndPos:    4186,
-							},
-						},
-						Value: []byte("foo"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 225,
-						EndLine:   225,
-						StartPos:  4188,
-						EndPos:    4199,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 225,
-							EndLine:   225,
-							StartPos:  4188,
-							EndPos:    4197,
-						},
-					},
-					Var: &ast.ExprPropertyFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 225,
-								EndLine:   225,
-								StartPos:  4188,
-								EndPos:    4195,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 225,
-									EndLine:   225,
-									StartPos:  4188,
-									EndPos:    4190,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 225,
-										EndLine:   225,
-										StartPos:  4188,
-										EndPos:    4190,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Property: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 225,
-									EndLine:   225,
-									StartPos:  4192,
-									EndPos:    4195,
-								},
-							},
-							Value: []byte("foo"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 225,
-								EndLine:   225,
-								StartPos:  4196,
-								EndPos:    4197,
-							},
-						},
-						Value: []byte("1"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 226,
-						EndLine:   226,
-						StartPos:  4200,
-						EndPos:    4229,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 226,
-							EndLine:   226,
-							StartPos:  4200,
-							EndPos:    4227,
-						},
-					},
-					Var: &ast.ExprPropertyFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 226,
-								EndLine:   226,
-								StartPos:  4200,
-								EndPos:    4225,
-							},
-						},
-						Var: &ast.ExprMethodCall{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 226,
-									EndLine:   226,
-									StartPos:  4200,
-									EndPos:    4219,
-								},
-							},
-							Var: &ast.ExprPropertyFetch{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 226,
-										EndLine:   226,
-										StartPos:  4200,
-										EndPos:    4212,
-									},
-								},
-								Var: &ast.ExprPropertyFetch{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 226,
-											EndLine:   226,
-											StartPos:  4200,
-											EndPos:    4207,
-										},
-									},
-									Var: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 226,
-												EndLine:   226,
-												StartPos:  4200,
-												EndPos:    4202,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 226,
-													EndLine:   226,
-													StartPos:  4200,
-													EndPos:    4202,
-												},
-											},
-											Value: []byte("$a"),
-										},
-									},
-									Property: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 226,
-												EndLine:   226,
-												StartPos:  4204,
-												EndPos:    4207,
-											},
-										},
-										Value: []byte("foo"),
-									},
-								},
-								Property: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 226,
-											EndLine:   226,
-											StartPos:  4209,
-											EndPos:    4212,
-										},
-									},
-									Value: []byte("bar"),
-								},
-							},
-							Method: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 226,
-										EndLine:   226,
-										StartPos:  4214,
-										EndPos:    4217,
-									},
-								},
-								Value: []byte("baz"),
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 226,
-										EndLine:   226,
-										StartPos:  4217,
-										EndPos:    4219,
-									},
-								},
-							},
-						},
-						Property: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 226,
-									EndLine:   226,
-									StartPos:  4221,
-									EndPos:    4225,
-								},
-							},
-							Value: []byte("quux"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 226,
-								EndLine:   226,
-								StartPos:  4226,
-								EndPos:    4227,
-							},
-						},
-						Value: []byte("0"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 227,
-						EndLine:   227,
-						StartPos:  4230,
-						EndPos:    4246,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 227,
-							EndLine:   227,
-							StartPos:  4230,
-							EndPos:    4244,
-						},
-					},
-					Var: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 227,
-								EndLine:   227,
-								StartPos:  4230,
-								EndPos:    4241,
-							},
-						},
-						Var: &ast.ExprMethodCall{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 227,
-									EndLine:   227,
-									StartPos:  4230,
-									EndPos:    4239,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 227,
-										EndLine:   227,
-										StartPos:  4230,
-										EndPos:    4232,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 227,
-											EndLine:   227,
-											StartPos:  4230,
-											EndPos:    4232,
-										},
-									},
-									Value: []byte("$a"),
-								},
-							},
-							Method: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 227,
-										EndLine:   227,
-										StartPos:  4234,
-										EndPos:    4237,
-									},
-								},
-								Value: []byte("foo"),
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 227,
-										EndLine:   227,
-										StartPos:  4237,
-										EndPos:    4239,
-									},
-								},
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 227,
-									EndLine:   227,
-									StartPos:  4240,
-									EndPos:    4241,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 227,
-								EndLine:   227,
-								StartPos:  4243,
-								EndPos:    4244,
-							},
-						},
-						Value: []byte("1"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 228,
-						EndLine:   228,
-						StartPos:  4247,
-						EndPos:    4256,
-					},
-				},
-				Expr: &ast.ExprShellExec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 228,
-							EndLine:   228,
-							StartPos:  4247,
-							EndPos:    4255,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 228,
-									EndLine:   228,
-									StartPos:  4248,
-									EndPos:    4252,
-								},
-							},
-							Value: []byte("cmd "),
-						},
-						&ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 228,
-									EndLine:   228,
-									StartPos:  4252,
-									EndPos:    4254,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 228,
-										EndLine:   228,
-										StartPos:  4252,
-										EndPos:    4254,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 229,
-						EndLine:   229,
-						StartPos:  4257,
-						EndPos:    4263,
-					},
-				},
-				Expr: &ast.ExprShellExec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 229,
-							EndLine:   229,
-							StartPos:  4257,
-							EndPos:    4262,
-						},
-					},
-					Parts: []ast.Vertex{
-						&ast.ScalarEncapsedStringPart{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 229,
-									EndLine:   229,
-									StartPos:  4258,
-									EndPos:    4261,
-								},
-							},
-							Value: []byte("cmd"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 230,
-						EndLine:   230,
-						StartPos:  4264,
-						EndPos:    4267,
-					},
-				},
-				Expr: &ast.ExprShellExec{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 230,
-							EndLine:   230,
-							StartPos:  4264,
-							EndPos:    4266,
-						},
-					},
-					Parts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 231,
-						EndLine:   231,
-						StartPos:  4268,
-						EndPos:    4271,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 231,
-							EndLine:   231,
-							StartPos:  4268,
-							EndPos:    4270,
-						},
-					},
-					Items: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 232,
-						EndLine:   232,
-						StartPos:  4272,
-						EndPos:    4276,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 232,
-							EndLine:   232,
-							StartPos:  4272,
-							EndPos:    4275,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 232,
-									EndLine:   232,
-									StartPos:  4273,
-									EndPos:    4274,
-								},
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 232,
-										EndLine:   232,
-										StartPos:  4273,
-										EndPos:    4274,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 233,
-						EndLine:   233,
-						StartPos:  4277,
-						EndPos:    4290,
-					},
-				},
-				Expr: &ast.ExprShortArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 233,
-							EndLine:   233,
-							StartPos:  4277,
-							EndPos:    4289,
-						},
-					},
-					Items: []ast.Vertex{
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 233,
-									EndLine:   233,
-									StartPos:  4278,
-									EndPos:    4282,
-								},
-							},
-							Key: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 233,
-										EndLine:   233,
-										StartPos:  4278,
-										EndPos:    4279,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Val: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 233,
-										EndLine:   233,
-										StartPos:  4281,
-										EndPos:    4282,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-						&ast.ExprArrayItem{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 233,
-									EndLine:   233,
-									StartPos:  4284,
-									EndPos:    4287,
-								},
-							},
-							Val: &ast.ExprReference{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 233,
-										EndLine:   233,
-										StartPos:  4284,
-										EndPos:    4287,
-									},
-								},
-								Var: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 233,
-											EndLine:   233,
-											StartPos:  4285,
-											EndPos:    4287,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 233,
-												EndLine:   233,
-												StartPos:  4285,
-												EndPos:    4287,
-											},
-										},
-										Value: []byte("$b"),
-									},
-								},
-							},
-						},
-						&ast.ExprArrayItem{},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 235,
-						EndLine:   235,
-						StartPos:  4292,
-						EndPos:    4303,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 235,
-							EndLine:   235,
-							StartPos:  4292,
-							EndPos:    4302,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 235,
-								EndLine:   235,
-								StartPos:  4292,
-								EndPos:    4295,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 235,
-										EndLine:   235,
-										StartPos:  4292,
-										EndPos:    4295,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 235,
-								EndLine:   235,
-								StartPos:  4297,
-								EndPos:    4300,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 235,
-								EndLine:   235,
-								StartPos:  4300,
-								EndPos:    4302,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 236,
-						EndLine:   236,
-						StartPos:  4304,
-						EndPos:    4325,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 236,
-							EndLine:   236,
-							StartPos:  4304,
-							EndPos:    4324,
-						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 236,
-								EndLine:   236,
-								StartPos:  4304,
-								EndPos:    4317,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 236,
-										EndLine:   236,
-										StartPos:  4314,
-										EndPos:    4317,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 236,
-								EndLine:   236,
-								StartPos:  4319,
-								EndPos:    4322,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 236,
-								EndLine:   236,
-								StartPos:  4322,
-								EndPos:    4324,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 237,
-						EndLine:   237,
-						StartPos:  4326,
-						EndPos:    4338,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 237,
-							EndLine:   237,
-							StartPos:  4326,
-							EndPos:    4337,
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 237,
-								EndLine:   237,
-								StartPos:  4326,
-								EndPos:    4330,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 237,
-										EndLine:   237,
-										StartPos:  4327,
-										EndPos:    4330,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 237,
-								EndLine:   237,
-								StartPos:  4332,
-								EndPos:    4335,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 237,
-								EndLine:   237,
-								StartPos:  4335,
-								EndPos:    4337,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 238,
-						EndLine:   238,
-						StartPos:  4339,
-						EndPos:    4351,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 238,
-							EndLine:   238,
-							StartPos:  4339,
-							EndPos:    4350,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 238,
-								EndLine:   238,
-								StartPos:  4339,
-								EndPos:    4342,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 238,
-										EndLine:   238,
-										StartPos:  4339,
-										EndPos:    4342,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Call: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 238,
-								EndLine:   238,
-								StartPos:  4344,
-								EndPos:    4348,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 238,
-									EndLine:   238,
-									StartPos:  4344,
-									EndPos:    4348,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 238,
-								EndLine:   238,
-								StartPos:  4348,
-								EndPos:    4350,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 239,
-						EndLine:   239,
-						StartPos:  4352,
-						EndPos:    4365,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 239,
-							EndLine:   239,
-							StartPos:  4352,
-							EndPos:    4364,
-						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 239,
-								EndLine:   239,
-								StartPos:  4352,
-								EndPos:    4356,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 239,
-									EndLine:   239,
-									StartPos:  4352,
-									EndPos:    4356,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					Call: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 239,
-								EndLine:   239,
-								StartPos:  4358,
-								EndPos:    4362,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 239,
-									EndLine:   239,
-									StartPos:  4358,
-									EndPos:    4362,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 239,
-								EndLine:   239,
-								StartPos:  4362,
-								EndPos:    4364,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 240,
-						EndLine:   240,
-						StartPos:  4366,
-						EndPos:    4376,
-					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 240,
-							EndLine:   240,
-							StartPos:  4366,
-							EndPos:    4375,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 240,
-								EndLine:   240,
-								StartPos:  4366,
-								EndPos:    4369,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 240,
-										EndLine:   240,
-										StartPos:  4366,
-										EndPos:    4369,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 240,
-								EndLine:   240,
-								StartPos:  4371,
-								EndPos:    4375,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 240,
-									EndLine:   240,
-									StartPos:  4371,
-									EndPos:    4375,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 241,
-						EndLine:   241,
-						StartPos:  4377,
-						EndPos:    4397,
-					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 241,
-							EndLine:   241,
-							StartPos:  4377,
-							EndPos:    4396,
-						},
-					},
-					Class: &ast.NameRelative{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 241,
-								EndLine:   241,
-								StartPos:  4377,
-								EndPos:    4390,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 241,
-										EndLine:   241,
-										StartPos:  4387,
-										EndPos:    4390,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 241,
-								EndLine:   241,
-								StartPos:  4392,
-								EndPos:    4396,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 241,
-									EndLine:   241,
-									StartPos:  4392,
-									EndPos:    4396,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 242,
-						EndLine:   242,
-						StartPos:  4398,
-						EndPos:    4409,
-					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 242,
-							EndLine:   242,
-							StartPos:  4398,
-							EndPos:    4408,
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 242,
-								EndLine:   242,
-								StartPos:  4398,
-								EndPos:    4402,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 242,
-										EndLine:   242,
-										StartPos:  4399,
-										EndPos:    4402,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 242,
-								EndLine:   242,
-								StartPos:  4404,
-								EndPos:    4408,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 242,
-									EndLine:   242,
-									StartPos:  4404,
-									EndPos:    4408,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 243,
-						EndLine:   243,
-						StartPos:  4410,
-						EndPos:    4423,
-					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 243,
-							EndLine:   243,
-							StartPos:  4410,
-							EndPos:    4422,
-						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 243,
-								EndLine:   243,
-								StartPos:  4410,
-								EndPos:    4412,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 243,
-									EndLine:   243,
-									StartPos:  4410,
-									EndPos:    4412,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					IfTrue: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 243,
-								EndLine:   243,
-								StartPos:  4415,
-								EndPos:    4417,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 243,
-									EndLine:   243,
-									StartPos:  4415,
-									EndPos:    4417,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 243,
-								EndLine:   243,
-								StartPos:  4420,
-								EndPos:    4422,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 243,
-									EndLine:   243,
-									StartPos:  4420,
-									EndPos:    4422,
-								},
-							},
-							Value: []byte("$c"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 244,
-						EndLine:   244,
-						StartPos:  4424,
-						EndPos:    4434,
-					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 244,
-							EndLine:   244,
-							StartPos:  4424,
-							EndPos:    4433,
-						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 244,
-								EndLine:   244,
-								StartPos:  4424,
-								EndPos:    4426,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 244,
-									EndLine:   244,
-									StartPos:  4424,
-									EndPos:    4426,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 244,
-								EndLine:   244,
-								StartPos:  4431,
-								EndPos:    4433,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 244,
-									EndLine:   244,
-									StartPos:  4431,
-									EndPos:    4433,
-								},
-							},
-							Value: []byte("$c"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 245,
-						EndLine:   245,
-						StartPos:  4435,
-						EndPos:    4458,
-					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 245,
-							EndLine:   245,
-							StartPos:  4435,
-							EndPos:    4457,
-						},
-					},
-					Condition: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 245,
-								EndLine:   245,
-								StartPos:  4435,
-								EndPos:    4437,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 245,
-									EndLine:   245,
-									StartPos:  4435,
-									EndPos:    4437,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					IfTrue: &ast.ExprTernary{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 245,
-								EndLine:   245,
-								StartPos:  4440,
-								EndPos:    4452,
-							},
-						},
-						Condition: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 245,
-									EndLine:   245,
-									StartPos:  4440,
-									EndPos:    4442,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 245,
-										EndLine:   245,
-										StartPos:  4440,
-										EndPos:    4442,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						IfTrue: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 245,
-									EndLine:   245,
-									StartPos:  4445,
-									EndPos:    4447,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 245,
-										EndLine:   245,
-										StartPos:  4445,
-										EndPos:    4447,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-						IfFalse: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 245,
-									EndLine:   245,
-									StartPos:  4450,
-									EndPos:    4452,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 245,
-										EndLine:   245,
-										StartPos:  4450,
-										EndPos:    4452,
-									},
-								},
-								Value: []byte("$d"),
-							},
-						},
-					},
-					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 245,
-								EndLine:   245,
-								StartPos:  4455,
-								EndPos:    4457,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 245,
-									EndLine:   245,
-									StartPos:  4455,
-									EndPos:    4457,
-								},
-							},
-							Value: []byte("$e"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 246,
-						EndLine:   246,
-						StartPos:  4459,
-						EndPos:    4482,
-					},
-				},
-				Expr: &ast.ExprTernary{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 246,
-							EndLine:   246,
-							StartPos:  4459,
-							EndPos:    4481,
-						},
-					},
-					Condition: &ast.ExprTernary{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 246,
-								EndLine:   246,
-								StartPos:  4459,
-								EndPos:    4471,
-							},
-						},
-						Condition: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 246,
-									EndLine:   246,
-									StartPos:  4459,
-									EndPos:    4461,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 246,
-										EndLine:   246,
-										StartPos:  4459,
-										EndPos:    4461,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						IfTrue: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 246,
-									EndLine:   246,
-									StartPos:  4464,
-									EndPos:    4466,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 246,
-										EndLine:   246,
-										StartPos:  4464,
-										EndPos:    4466,
-									},
-								},
-								Value: []byte("$b"),
-							},
-						},
-						IfFalse: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 246,
-									EndLine:   246,
-									StartPos:  4469,
-									EndPos:    4471,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 246,
-										EndLine:   246,
-										StartPos:  4469,
-										EndPos:    4471,
-									},
-								},
-								Value: []byte("$c"),
-							},
-						},
-					},
-					IfTrue: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 246,
-								EndLine:   246,
-								StartPos:  4474,
-								EndPos:    4476,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 246,
-									EndLine:   246,
-									StartPos:  4474,
-									EndPos:    4476,
-								},
-							},
-							Value: []byte("$d"),
-						},
-					},
-					IfFalse: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 246,
-								EndLine:   246,
-								StartPos:  4479,
-								EndPos:    4481,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 246,
-									EndLine:   246,
-									StartPos:  4479,
-									EndPos:    4481,
-								},
-							},
-							Value: []byte("$e"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 247,
-						EndLine:   247,
-						StartPos:  4483,
-						EndPos:    4487,
-					},
-				},
-				Expr: &ast.ExprUnaryMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 247,
-							EndLine:   247,
-							StartPos:  4483,
-							EndPos:    4486,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 247,
-								EndLine:   247,
-								StartPos:  4484,
-								EndPos:    4486,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 247,
-									EndLine:   247,
-									StartPos:  4484,
-									EndPos:    4486,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 248,
-						EndLine:   248,
-						StartPos:  4488,
-						EndPos:    4492,
-					},
-				},
-				Expr: &ast.ExprUnaryPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 248,
-							EndLine:   248,
-							StartPos:  4488,
-							EndPos:    4491,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 248,
-								EndLine:   248,
-								StartPos:  4489,
-								EndPos:    4491,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 248,
-									EndLine:   248,
-									StartPos:  4489,
-									EndPos:    4491,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 249,
-						EndLine:   249,
-						StartPos:  4493,
-						EndPos:    4497,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 249,
-							EndLine:   249,
-							StartPos:  4493,
-							EndPos:    4496,
-						},
-					},
-					VarName: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 249,
-								EndLine:   249,
-								StartPos:  4494,
-								EndPos:    4496,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 249,
-									EndLine:   249,
-									StartPos:  4494,
-									EndPos:    4496,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 250,
-						EndLine:   250,
-						StartPos:  4498,
-						EndPos:    4503,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 250,
-							EndLine:   250,
-							StartPos:  4498,
-							EndPos:    4502,
-						},
-					},
-					VarName: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 250,
-								EndLine:   250,
-								StartPos:  4499,
-								EndPos:    4502,
-							},
-						},
-						VarName: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 250,
-									EndLine:   250,
-									StartPos:  4500,
-									EndPos:    4502,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 250,
-										EndLine:   250,
-										StartPos:  4500,
-										EndPos:    4502,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 251,
-						EndLine:   251,
-						StartPos:  4504,
-						EndPos:    4510,
-					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 251,
-							EndLine:   251,
-							StartPos:  4504,
-							EndPos:    4509,
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 252,
-						EndLine:   252,
-						StartPos:  4511,
-						EndPos:    4520,
-					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 252,
-							EndLine:   252,
-							StartPos:  4511,
-							EndPos:    4519,
-						},
-					},
-					Value: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 252,
-								EndLine:   252,
-								StartPos:  4517,
-								EndPos:    4519,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 252,
-									EndLine:   252,
-									StartPos:  4517,
-									EndPos:    4519,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 253,
-						EndLine:   253,
-						StartPos:  4521,
-						EndPos:    4536,
-					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 253,
-							EndLine:   253,
-							StartPos:  4521,
-							EndPos:    4535,
-						},
-					},
-					Key: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 253,
-								EndLine:   253,
-								StartPos:  4527,
-								EndPos:    4529,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 253,
-									EndLine:   253,
-									StartPos:  4527,
-									EndPos:    4529,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Value: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 253,
-								EndLine:   253,
-								StartPos:  4533,
-								EndPos:    4535,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 253,
-									EndLine:   253,
-									StartPos:  4533,
-									EndPos:    4535,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 254,
-						EndLine:   254,
-						StartPos:  4537,
-						EndPos:    4554,
-					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 254,
-							EndLine:   254,
-							StartPos:  4537,
-							EndPos:    4553,
-						},
-					},
-					Value: &ast.ExprClassConstFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 254,
-								EndLine:   254,
-								StartPos:  4543,
-								EndPos:    4553,
-							},
-						},
-						Class: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 254,
-									EndLine:   254,
-									StartPos:  4543,
-									EndPos:    4546,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 254,
-											EndLine:   254,
-											StartPos:  4543,
-											EndPos:    4546,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						ConstantName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 254,
-									EndLine:   254,
-									StartPos:  4548,
-									EndPos:    4553,
-								},
-							},
-							Value: []byte("class"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 255,
-						EndLine:   255,
-						StartPos:  4555,
-						EndPos:    4578,
-					},
-				},
-				Expr: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 255,
-							EndLine:   255,
-							StartPos:  4555,
-							EndPos:    4577,
-						},
-					},
-					Key: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 255,
-								EndLine:   255,
-								StartPos:  4561,
-								EndPos:    4563,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 255,
-									EndLine:   255,
-									StartPos:  4561,
-									EndPos:    4563,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Value: &ast.ExprClassConstFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 255,
-								EndLine:   255,
-								StartPos:  4567,
-								EndPos:    4577,
-							},
-						},
-						Class: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 255,
-									EndLine:   255,
-									StartPos:  4567,
-									EndPos:    4570,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 255,
-											EndLine:   255,
-											StartPos:  4567,
-											EndPos:    4570,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						ConstantName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 255,
-									EndLine:   255,
-									StartPos:  4572,
-									EndPos:    4577,
-								},
-							},
-							Value: []byte("class"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 257,
-						EndLine:   257,
-						StartPos:  4580,
-						EndPos:    4590,
-					},
-				},
-				Expr: &ast.ExprCastArray{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 257,
-							EndLine:   257,
-							StartPos:  4580,
-							EndPos:    4589,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 257,
-								EndLine:   257,
-								StartPos:  4587,
-								EndPos:    4589,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 257,
-									EndLine:   257,
-									StartPos:  4587,
-									EndPos:    4589,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 258,
-						EndLine:   258,
-						StartPos:  4591,
-						EndPos:    4603,
-					},
-				},
-				Expr: &ast.ExprCastBool{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 258,
-							EndLine:   258,
-							StartPos:  4591,
-							EndPos:    4602,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 258,
-								EndLine:   258,
-								StartPos:  4600,
-								EndPos:    4602,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 258,
-									EndLine:   258,
-									StartPos:  4600,
-									EndPos:    4602,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 259,
-						EndLine:   259,
-						StartPos:  4604,
-						EndPos:    4613,
-					},
-				},
-				Expr: &ast.ExprCastBool{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 259,
-							EndLine:   259,
-							StartPos:  4604,
-							EndPos:    4612,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 259,
-								EndLine:   259,
-								StartPos:  4610,
-								EndPos:    4612,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 259,
-									EndLine:   259,
-									StartPos:  4610,
-									EndPos:    4612,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 260,
-						EndLine:   260,
-						StartPos:  4614,
-						EndPos:    4625,
-					},
-				},
-				Expr: &ast.ExprCastDouble{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 260,
-							EndLine:   260,
-							StartPos:  4614,
-							EndPos:    4624,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 260,
-								EndLine:   260,
-								StartPos:  4622,
-								EndPos:    4624,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 260,
-									EndLine:   260,
-									StartPos:  4622,
-									EndPos:    4624,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 261,
-						EndLine:   261,
-						StartPos:  4626,
-						EndPos:    4636,
-					},
-				},
-				Expr: &ast.ExprCastDouble{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 261,
-							EndLine:   261,
-							StartPos:  4626,
-							EndPos:    4635,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 261,
-								EndLine:   261,
-								StartPos:  4633,
-								EndPos:    4635,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 261,
-									EndLine:   261,
-									StartPos:  4633,
-									EndPos:    4635,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 262,
-						EndLine:   262,
-						StartPos:  4637,
-						EndPos:    4649,
-					},
-				},
-				Expr: &ast.ExprCastInt{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 262,
-							EndLine:   262,
-							StartPos:  4637,
-							EndPos:    4648,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 262,
-								EndLine:   262,
-								StartPos:  4646,
-								EndPos:    4648,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 262,
-									EndLine:   262,
-									StartPos:  4646,
-									EndPos:    4648,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 263,
-						EndLine:   263,
-						StartPos:  4650,
-						EndPos:    4658,
-					},
-				},
-				Expr: &ast.ExprCastInt{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 263,
-							EndLine:   263,
-							StartPos:  4650,
-							EndPos:    4657,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 263,
-								EndLine:   263,
-								StartPos:  4655,
-								EndPos:    4657,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 263,
-									EndLine:   263,
-									StartPos:  4655,
-									EndPos:    4657,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 264,
-						EndLine:   264,
-						StartPos:  4659,
-						EndPos:    4670,
-					},
-				},
-				Expr: &ast.ExprCastObject{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 264,
-							EndLine:   264,
-							StartPos:  4659,
-							EndPos:    4669,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 264,
-								EndLine:   264,
-								StartPos:  4667,
-								EndPos:    4669,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 264,
-									EndLine:   264,
-									StartPos:  4667,
-									EndPos:    4669,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 265,
-						EndLine:   265,
-						StartPos:  4671,
-						EndPos:    4682,
-					},
-				},
-				Expr: &ast.ExprCastString{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 265,
-							EndLine:   265,
-							StartPos:  4671,
-							EndPos:    4681,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 265,
-								EndLine:   265,
-								StartPos:  4679,
-								EndPos:    4681,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 265,
-									EndLine:   265,
-									StartPos:  4679,
-									EndPos:    4681,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 266,
-						EndLine:   266,
-						StartPos:  4683,
-						EndPos:    4693,
-					},
-				},
-				Expr: &ast.ExprCastUnset{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 266,
-							EndLine:   266,
-							StartPos:  4683,
-							EndPos:    4692,
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 266,
-								EndLine:   266,
-								StartPos:  4690,
-								EndPos:    4692,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 266,
-									EndLine:   266,
-									StartPos:  4690,
-									EndPos:    4692,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 268,
-						EndLine:   268,
-						StartPos:  4695,
-						EndPos:    4703,
-					},
-				},
-				Expr: &ast.ExprBinaryBitwiseAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 268,
-							EndLine:   268,
-							StartPos:  4695,
-							EndPos:    4702,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 268,
-								EndLine:   268,
-								StartPos:  4695,
-								EndPos:    4697,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 268,
-									EndLine:   268,
-									StartPos:  4695,
-									EndPos:    4697,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 268,
-								EndLine:   268,
-								StartPos:  4700,
-								EndPos:    4702,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 268,
-									EndLine:   268,
-									StartPos:  4700,
-									EndPos:    4702,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 269,
-						EndLine:   269,
-						StartPos:  4704,
-						EndPos:    4712,
-					},
-				},
-				Expr: &ast.ExprBinaryBitwiseOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 269,
-							EndLine:   269,
-							StartPos:  4704,
-							EndPos:    4711,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 269,
-								EndLine:   269,
-								StartPos:  4704,
-								EndPos:    4706,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 269,
-									EndLine:   269,
-									StartPos:  4704,
-									EndPos:    4706,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 269,
-								EndLine:   269,
-								StartPos:  4709,
-								EndPos:    4711,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 269,
-									EndLine:   269,
-									StartPos:  4709,
-									EndPos:    4711,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 270,
-						EndLine:   270,
-						StartPos:  4713,
-						EndPos:    4721,
-					},
-				},
-				Expr: &ast.ExprBinaryBitwiseXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 270,
-							EndLine:   270,
-							StartPos:  4713,
-							EndPos:    4720,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 270,
-								EndLine:   270,
-								StartPos:  4713,
-								EndPos:    4715,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 270,
-									EndLine:   270,
-									StartPos:  4713,
-									EndPos:    4715,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 270,
-								EndLine:   270,
-								StartPos:  4718,
-								EndPos:    4720,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 270,
-									EndLine:   270,
-									StartPos:  4718,
-									EndPos:    4720,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 271,
-						EndLine:   271,
-						StartPos:  4722,
-						EndPos:    4731,
-					},
-				},
-				Expr: &ast.ExprBinaryBooleanAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 271,
-							EndLine:   271,
-							StartPos:  4722,
-							EndPos:    4730,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 271,
-								EndLine:   271,
-								StartPos:  4722,
-								EndPos:    4724,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 271,
-									EndLine:   271,
-									StartPos:  4722,
-									EndPos:    4724,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 271,
-								EndLine:   271,
-								StartPos:  4728,
-								EndPos:    4730,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 271,
-									EndLine:   271,
-									StartPos:  4728,
-									EndPos:    4730,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 272,
-						EndLine:   272,
-						StartPos:  4732,
-						EndPos:    4741,
-					},
-				},
-				Expr: &ast.ExprBinaryBooleanOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 272,
-							EndLine:   272,
-							StartPos:  4732,
-							EndPos:    4740,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 272,
-								EndLine:   272,
-								StartPos:  4732,
-								EndPos:    4734,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 272,
-									EndLine:   272,
-									StartPos:  4732,
-									EndPos:    4734,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 272,
-								EndLine:   272,
-								StartPos:  4738,
-								EndPos:    4740,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 272,
-									EndLine:   272,
-									StartPos:  4738,
-									EndPos:    4740,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 273,
-						EndLine:   273,
-						StartPos:  4742,
-						EndPos:    4750,
-					},
-				},
-				Expr: &ast.ExprBinaryConcat{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 273,
-							EndLine:   273,
-							StartPos:  4742,
-							EndPos:    4749,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 273,
-								EndLine:   273,
-								StartPos:  4742,
-								EndPos:    4744,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 273,
-									EndLine:   273,
-									StartPos:  4742,
-									EndPos:    4744,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 273,
-								EndLine:   273,
-								StartPos:  4747,
-								EndPos:    4749,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 273,
-									EndLine:   273,
-									StartPos:  4747,
-									EndPos:    4749,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 274,
-						EndLine:   274,
-						StartPos:  4751,
-						EndPos:    4759,
-					},
-				},
-				Expr: &ast.ExprBinaryDiv{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 274,
-							EndLine:   274,
-							StartPos:  4751,
-							EndPos:    4758,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 274,
-								EndLine:   274,
-								StartPos:  4751,
-								EndPos:    4753,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 274,
-									EndLine:   274,
-									StartPos:  4751,
-									EndPos:    4753,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 274,
-								EndLine:   274,
-								StartPos:  4756,
-								EndPos:    4758,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 274,
-									EndLine:   274,
-									StartPos:  4756,
-									EndPos:    4758,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 275,
-						EndLine:   275,
-						StartPos:  4760,
-						EndPos:    4769,
-					},
-				},
-				Expr: &ast.ExprBinaryEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 275,
-							EndLine:   275,
-							StartPos:  4760,
-							EndPos:    4768,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 275,
-								EndLine:   275,
-								StartPos:  4760,
-								EndPos:    4762,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 275,
-									EndLine:   275,
-									StartPos:  4760,
-									EndPos:    4762,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 275,
-								EndLine:   275,
-								StartPos:  4766,
-								EndPos:    4768,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 275,
-									EndLine:   275,
-									StartPos:  4766,
-									EndPos:    4768,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 276,
-						EndLine:   276,
-						StartPos:  4770,
-						EndPos:    4779,
-					},
-				},
-				Expr: &ast.ExprBinaryGreaterOrEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 276,
-							EndLine:   276,
-							StartPos:  4770,
-							EndPos:    4778,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 276,
-								EndLine:   276,
-								StartPos:  4770,
-								EndPos:    4772,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 276,
-									EndLine:   276,
-									StartPos:  4770,
-									EndPos:    4772,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 276,
-								EndLine:   276,
-								StartPos:  4776,
-								EndPos:    4778,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 276,
-									EndLine:   276,
-									StartPos:  4776,
-									EndPos:    4778,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 277,
-						EndLine:   277,
-						StartPos:  4780,
-						EndPos:    4788,
-					},
-				},
-				Expr: &ast.ExprBinaryGreater{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 277,
-							EndLine:   277,
-							StartPos:  4780,
-							EndPos:    4787,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 277,
-								EndLine:   277,
-								StartPos:  4780,
-								EndPos:    4782,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 277,
-									EndLine:   277,
-									StartPos:  4780,
-									EndPos:    4782,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 277,
-								EndLine:   277,
-								StartPos:  4785,
-								EndPos:    4787,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 277,
-									EndLine:   277,
-									StartPos:  4785,
-									EndPos:    4787,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 278,
-						EndLine:   278,
-						StartPos:  4789,
-						EndPos:    4799,
-					},
-				},
-				Expr: &ast.ExprBinaryIdentical{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 278,
-							EndLine:   278,
-							StartPos:  4789,
-							EndPos:    4798,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 278,
-								EndLine:   278,
-								StartPos:  4789,
-								EndPos:    4791,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 278,
-									EndLine:   278,
-									StartPos:  4789,
-									EndPos:    4791,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &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("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 279,
-						EndLine:   279,
-						StartPos:  4800,
-						EndPos:    4810,
-					},
-				},
-				Expr: &ast.ExprBinaryLogicalAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 279,
-							EndLine:   279,
-							StartPos:  4800,
-							EndPos:    4809,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 279,
-								EndLine:   279,
-								StartPos:  4800,
-								EndPos:    4802,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 279,
-									EndLine:   279,
-									StartPos:  4800,
-									EndPos:    4802,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 279,
-								EndLine:   279,
-								StartPos:  4807,
-								EndPos:    4809,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 279,
-									EndLine:   279,
-									StartPos:  4807,
-									EndPos:    4809,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 280,
-						EndLine:   280,
-						StartPos:  4811,
-						EndPos:    4820,
-					},
-				},
-				Expr: &ast.ExprBinaryLogicalOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 280,
-							EndLine:   280,
-							StartPos:  4811,
-							EndPos:    4819,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 280,
-								EndLine:   280,
-								StartPos:  4811,
-								EndPos:    4813,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 280,
-									EndLine:   280,
-									StartPos:  4811,
-									EndPos:    4813,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 280,
-								EndLine:   280,
-								StartPos:  4817,
-								EndPos:    4819,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 280,
-									EndLine:   280,
-									StartPos:  4817,
-									EndPos:    4819,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 281,
-						EndLine:   281,
-						StartPos:  4821,
-						EndPos:    4831,
-					},
-				},
-				Expr: &ast.ExprBinaryLogicalXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 281,
-							EndLine:   281,
-							StartPos:  4821,
-							EndPos:    4830,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 281,
-								EndLine:   281,
-								StartPos:  4821,
-								EndPos:    4823,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 281,
-									EndLine:   281,
-									StartPos:  4821,
-									EndPos:    4823,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 281,
-								EndLine:   281,
-								StartPos:  4828,
-								EndPos:    4830,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 281,
-									EndLine:   281,
-									StartPos:  4828,
-									EndPos:    4830,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 282,
-						EndLine:   282,
-						StartPos:  4832,
-						EndPos:    4840,
-					},
-				},
-				Expr: &ast.ExprBinaryMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 282,
-							EndLine:   282,
-							StartPos:  4832,
-							EndPos:    4839,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 282,
-								EndLine:   282,
-								StartPos:  4832,
-								EndPos:    4834,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 282,
-									EndLine:   282,
-									StartPos:  4832,
-									EndPos:    4834,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 282,
-								EndLine:   282,
-								StartPos:  4837,
-								EndPos:    4839,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 282,
-									EndLine:   282,
-									StartPos:  4837,
-									EndPos:    4839,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 283,
-						EndLine:   283,
-						StartPos:  4841,
-						EndPos:    4849,
-					},
-				},
-				Expr: &ast.ExprBinaryMod{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 283,
-							EndLine:   283,
-							StartPos:  4841,
-							EndPos:    4848,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 283,
-								EndLine:   283,
-								StartPos:  4841,
-								EndPos:    4843,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 283,
-									EndLine:   283,
-									StartPos:  4841,
-									EndPos:    4843,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 283,
-								EndLine:   283,
-								StartPos:  4846,
-								EndPos:    4848,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 283,
-									EndLine:   283,
-									StartPos:  4846,
-									EndPos:    4848,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 284,
-						EndLine:   284,
-						StartPos:  4850,
-						EndPos:    4858,
-					},
-				},
-				Expr: &ast.ExprBinaryMul{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 284,
-							EndLine:   284,
-							StartPos:  4850,
-							EndPos:    4857,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 284,
-								EndLine:   284,
-								StartPos:  4850,
-								EndPos:    4852,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 284,
-									EndLine:   284,
-									StartPos:  4850,
-									EndPos:    4852,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 284,
-								EndLine:   284,
-								StartPos:  4855,
-								EndPos:    4857,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 284,
-									EndLine:   284,
-									StartPos:  4855,
-									EndPos:    4857,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 285,
-						EndLine:   285,
-						StartPos:  4859,
-						EndPos:    4868,
-					},
-				},
-				Expr: &ast.ExprBinaryNotEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 285,
-							EndLine:   285,
-							StartPos:  4859,
-							EndPos:    4867,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 285,
-								EndLine:   285,
-								StartPos:  4859,
-								EndPos:    4861,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 285,
-									EndLine:   285,
-									StartPos:  4859,
-									EndPos:    4861,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 285,
-								EndLine:   285,
-								StartPos:  4865,
-								EndPos:    4867,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 285,
-									EndLine:   285,
-									StartPos:  4865,
-									EndPos:    4867,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 286,
-						EndLine:   286,
-						StartPos:  4869,
-						EndPos:    4879,
-					},
-				},
-				Expr: &ast.ExprBinaryNotIdentical{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 286,
-							EndLine:   286,
-							StartPos:  4869,
-							EndPos:    4878,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 286,
-								EndLine:   286,
-								StartPos:  4869,
-								EndPos:    4871,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 286,
-									EndLine:   286,
-									StartPos:  4869,
-									EndPos:    4871,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 286,
-								EndLine:   286,
-								StartPos:  4876,
-								EndPos:    4878,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 286,
-									EndLine:   286,
-									StartPos:  4876,
-									EndPos:    4878,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 287,
-						EndLine:   287,
-						StartPos:  4880,
-						EndPos:    4888,
-					},
-				},
-				Expr: &ast.ExprBinaryPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 287,
-							EndLine:   287,
-							StartPos:  4880,
-							EndPos:    4887,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 287,
-								EndLine:   287,
-								StartPos:  4880,
-								EndPos:    4882,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 287,
-									EndLine:   287,
-									StartPos:  4880,
-									EndPos:    4882,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &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("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 288,
-						EndLine:   288,
-						StartPos:  4889,
-						EndPos:    4898,
-					},
-				},
-				Expr: &ast.ExprBinaryPow{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 288,
-							EndLine:   288,
-							StartPos:  4889,
-							EndPos:    4897,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 288,
-								EndLine:   288,
-								StartPos:  4889,
-								EndPos:    4891,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 288,
-									EndLine:   288,
-									StartPos:  4889,
-									EndPos:    4891,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &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("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 289,
-						EndLine:   289,
-						StartPos:  4899,
-						EndPos:    4908,
-					},
-				},
-				Expr: &ast.ExprBinaryShiftLeft{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 289,
-							EndLine:   289,
-							StartPos:  4899,
-							EndPos:    4907,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 289,
-								EndLine:   289,
-								StartPos:  4899,
-								EndPos:    4901,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 289,
-									EndLine:   289,
-									StartPos:  4899,
-									EndPos:    4901,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 289,
-								EndLine:   289,
-								StartPos:  4905,
-								EndPos:    4907,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 289,
-									EndLine:   289,
-									StartPos:  4905,
-									EndPos:    4907,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 290,
-						EndLine:   290,
-						StartPos:  4909,
-						EndPos:    4918,
-					},
-				},
-				Expr: &ast.ExprBinaryShiftRight{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 290,
-							EndLine:   290,
-							StartPos:  4909,
-							EndPos:    4917,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 290,
-								EndLine:   290,
-								StartPos:  4909,
-								EndPos:    4911,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 290,
-									EndLine:   290,
-									StartPos:  4909,
-									EndPos:    4911,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &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("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 291,
-						EndLine:   291,
-						StartPos:  4919,
-						EndPos:    4928,
-					},
-				},
-				Expr: &ast.ExprBinarySmallerOrEqual{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 291,
-							EndLine:   291,
-							StartPos:  4919,
-							EndPos:    4927,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 291,
-								EndLine:   291,
-								StartPos:  4919,
-								EndPos:    4921,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 291,
-									EndLine:   291,
-									StartPos:  4919,
-									EndPos:    4921,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 291,
-								EndLine:   291,
-								StartPos:  4925,
-								EndPos:    4927,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 291,
-									EndLine:   291,
-									StartPos:  4925,
-									EndPos:    4927,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 292,
-						EndLine:   292,
-						StartPos:  4929,
-						EndPos:    4937,
-					},
-				},
-				Expr: &ast.ExprBinarySmaller{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 292,
-							EndLine:   292,
-							StartPos:  4929,
-							EndPos:    4936,
-						},
-					},
-					Left: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 292,
-								EndLine:   292,
-								StartPos:  4929,
-								EndPos:    4931,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 292,
-									EndLine:   292,
-									StartPos:  4929,
-									EndPos:    4931,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Right: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 292,
-								EndLine:   292,
-								StartPos:  4934,
-								EndPos:    4936,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 292,
-									EndLine:   292,
-									StartPos:  4934,
-									EndPos:    4936,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 294,
-						EndLine:   294,
-						StartPos:  4939,
-						EndPos:    4948,
-					},
-				},
-				Expr: &ast.ExprAssignReference{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 294,
-							EndLine:   294,
-							StartPos:  4939,
-							EndPos:    4947,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 294,
-								EndLine:   294,
-								StartPos:  4939,
-								EndPos:    4941,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 294,
-									EndLine:   294,
-									StartPos:  4939,
-									EndPos:    4941,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 294,
-								EndLine:   294,
-								StartPos:  4945,
-								EndPos:    4947,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 294,
-									EndLine:   294,
-									StartPos:  4945,
-									EndPos:    4947,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 295,
-						EndLine:   295,
-						StartPos:  4949,
-						EndPos:    4963,
-					},
-				},
-				Expr: &ast.ExprAssignReference{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 295,
-							EndLine:   295,
-							StartPos:  4949,
-							EndPos:    4962,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 295,
-								EndLine:   295,
-								StartPos:  4949,
-								EndPos:    4951,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 295,
-									EndLine:   295,
-									StartPos:  4949,
-									EndPos:    4951,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprNew{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 295,
-								EndLine:   295,
-								StartPos:  4955,
-								EndPos:    4962,
-							},
-						},
-						Class: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 295,
-									EndLine:   295,
-									StartPos:  4959,
-									EndPos:    4962,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 295,
-											EndLine:   295,
-											StartPos:  4959,
-											EndPos:    4962,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 296,
-						EndLine:   296,
-						StartPos:  4964,
-						EndPos:    4982,
-					},
-				},
-				Expr: &ast.ExprAssignReference{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 296,
-							EndLine:   296,
-							StartPos:  4964,
-							EndPos:    4981,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 296,
-								EndLine:   296,
-								StartPos:  4964,
-								EndPos:    4966,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 296,
-									EndLine:   296,
-									StartPos:  4964,
-									EndPos:    4966,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprNew{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 296,
-								EndLine:   296,
-								StartPos:  4970,
-								EndPos:    4981,
-							},
-						},
-						Class: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 296,
-									EndLine:   296,
-									StartPos:  4974,
-									EndPos:    4977,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 296,
-											EndLine:   296,
-											StartPos:  4974,
-											EndPos:    4977,
-										},
-									},
-									Value: []byte("Foo"),
-								},
-							},
-						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 296,
-									EndLine:   296,
-									StartPos:  4977,
-									EndPos:    4981,
-								},
-							},
-							Arguments: []ast.Vertex{
-								&ast.Argument{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 296,
-											EndLine:   296,
-											StartPos:  4978,
-											EndPos:    4980,
-										},
-									},
-									Expr: &ast.ExprVariable{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 296,
-												EndLine:   296,
-												StartPos:  4978,
-												EndPos:    4980,
-											},
-										},
-										VarName: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 296,
-													EndLine:   296,
-													StartPos:  4978,
-													EndPos:    4980,
-												},
-											},
-											Value: []byte("$b"),
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 297,
-						EndLine:   297,
-						StartPos:  4983,
-						EndPos:    4991,
-					},
-				},
-				Expr: &ast.ExprAssign{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 297,
-							EndLine:   297,
-							StartPos:  4983,
-							EndPos:    4990,
-						},
-					},
-					Var: &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"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 297,
-								EndLine:   297,
-								StartPos:  4988,
-								EndPos:    4990,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 297,
-									EndLine:   297,
-									StartPos:  4988,
-									EndPos:    4990,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 298,
-						EndLine:   298,
-						StartPos:  4992,
-						EndPos:    5001,
-					},
-				},
-				Expr: &ast.ExprAssignBitwiseAnd{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 298,
-							EndLine:   298,
-							StartPos:  4992,
-							EndPos:    5000,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 298,
-								EndLine:   298,
-								StartPos:  4992,
-								EndPos:    4994,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 298,
-									EndLine:   298,
-									StartPos:  4992,
-									EndPos:    4994,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 298,
-								EndLine:   298,
-								StartPos:  4998,
-								EndPos:    5000,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 298,
-									EndLine:   298,
-									StartPos:  4998,
-									EndPos:    5000,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 299,
-						EndLine:   299,
-						StartPos:  5002,
-						EndPos:    5011,
-					},
-				},
-				Expr: &ast.ExprAssignBitwiseOr{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 299,
-							EndLine:   299,
-							StartPos:  5002,
-							EndPos:    5010,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 299,
-								EndLine:   299,
-								StartPos:  5002,
-								EndPos:    5004,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 299,
-									EndLine:   299,
-									StartPos:  5002,
-									EndPos:    5004,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &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:    5021,
-					},
-				},
-				Expr: &ast.ExprAssignBitwiseXor{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 300,
-							EndLine:   300,
-							StartPos:  5012,
-							EndPos:    5020,
-						},
-					},
-					Var: &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"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 300,
-								EndLine:   300,
-								StartPos:  5018,
-								EndPos:    5020,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 300,
-									EndLine:   300,
-									StartPos:  5018,
-									EndPos:    5020,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 301,
-						EndLine:   301,
-						StartPos:  5022,
-						EndPos:    5031,
-					},
-				},
-				Expr: &ast.ExprAssignConcat{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 301,
-							EndLine:   301,
-							StartPos:  5022,
-							EndPos:    5030,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 301,
-								EndLine:   301,
-								StartPos:  5022,
-								EndPos:    5024,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 301,
-									EndLine:   301,
-									StartPos:  5022,
-									EndPos:    5024,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 301,
-								EndLine:   301,
-								StartPos:  5028,
-								EndPos:    5030,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 301,
-									EndLine:   301,
-									StartPos:  5028,
-									EndPos:    5030,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 302,
-						EndLine:   302,
-						StartPos:  5032,
-						EndPos:    5041,
-					},
-				},
-				Expr: &ast.ExprAssignDiv{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 302,
-							EndLine:   302,
-							StartPos:  5032,
-							EndPos:    5040,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 302,
-								EndLine:   302,
-								StartPos:  5032,
-								EndPos:    5034,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 302,
-									EndLine:   302,
-									StartPos:  5032,
-									EndPos:    5034,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 302,
-								EndLine:   302,
-								StartPos:  5038,
-								EndPos:    5040,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 302,
-									EndLine:   302,
-									StartPos:  5038,
-									EndPos:    5040,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 303,
-						EndLine:   303,
-						StartPos:  5042,
-						EndPos:    5051,
-					},
-				},
-				Expr: &ast.ExprAssignMinus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 303,
-							EndLine:   303,
-							StartPos:  5042,
-							EndPos:    5050,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 303,
-								EndLine:   303,
-								StartPos:  5042,
-								EndPos:    5044,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 303,
-									EndLine:   303,
-									StartPos:  5042,
-									EndPos:    5044,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 303,
-								EndLine:   303,
-								StartPos:  5048,
-								EndPos:    5050,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 303,
-									EndLine:   303,
-									StartPos:  5048,
-									EndPos:    5050,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 304,
-						EndLine:   304,
-						StartPos:  5052,
-						EndPos:    5061,
-					},
-				},
-				Expr: &ast.ExprAssignMod{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 304,
-							EndLine:   304,
-							StartPos:  5052,
-							EndPos:    5060,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 304,
-								EndLine:   304,
-								StartPos:  5052,
-								EndPos:    5054,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 304,
-									EndLine:   304,
-									StartPos:  5052,
-									EndPos:    5054,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 304,
-								EndLine:   304,
-								StartPos:  5058,
-								EndPos:    5060,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 304,
-									EndLine:   304,
-									StartPos:  5058,
-									EndPos:    5060,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 305,
-						EndLine:   305,
-						StartPos:  5062,
-						EndPos:    5071,
-					},
-				},
-				Expr: &ast.ExprAssignMul{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 305,
-							EndLine:   305,
-							StartPos:  5062,
-							EndPos:    5070,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 305,
-								EndLine:   305,
-								StartPos:  5062,
-								EndPos:    5064,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 305,
-									EndLine:   305,
-									StartPos:  5062,
-									EndPos:    5064,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 305,
-								EndLine:   305,
-								StartPos:  5068,
-								EndPos:    5070,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 305,
-									EndLine:   305,
-									StartPos:  5068,
-									EndPos:    5070,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 306,
-						EndLine:   306,
-						StartPos:  5072,
-						EndPos:    5081,
-					},
-				},
-				Expr: &ast.ExprAssignPlus{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 306,
-							EndLine:   306,
-							StartPos:  5072,
-							EndPos:    5080,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 306,
-								EndLine:   306,
-								StartPos:  5072,
-								EndPos:    5074,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 306,
-									EndLine:   306,
-									StartPos:  5072,
-									EndPos:    5074,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 306,
-								EndLine:   306,
-								StartPos:  5078,
-								EndPos:    5080,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 306,
-									EndLine:   306,
-									StartPos:  5078,
-									EndPos:    5080,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 307,
-						EndLine:   307,
-						StartPos:  5082,
-						EndPos:    5092,
-					},
-				},
-				Expr: &ast.ExprAssignPow{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 307,
-							EndLine:   307,
-							StartPos:  5082,
-							EndPos:    5091,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 307,
-								EndLine:   307,
-								StartPos:  5082,
-								EndPos:    5084,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 307,
-									EndLine:   307,
-									StartPos:  5082,
-									EndPos:    5084,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 307,
-								EndLine:   307,
-								StartPos:  5089,
-								EndPos:    5091,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 307,
-									EndLine:   307,
-									StartPos:  5089,
-									EndPos:    5091,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 308,
-						EndLine:   308,
-						StartPos:  5093,
-						EndPos:    5103,
-					},
-				},
-				Expr: &ast.ExprAssignShiftLeft{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 308,
-							EndLine:   308,
-							StartPos:  5093,
-							EndPos:    5102,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 308,
-								EndLine:   308,
-								StartPos:  5093,
-								EndPos:    5095,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 308,
-									EndLine:   308,
-									StartPos:  5093,
-									EndPos:    5095,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 308,
-								EndLine:   308,
-								StartPos:  5100,
-								EndPos:    5102,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 308,
-									EndLine:   308,
-									StartPos:  5100,
-									EndPos:    5102,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 309,
-						EndLine:   309,
-						StartPos:  5104,
-						EndPos:    5114,
-					},
-				},
-				Expr: &ast.ExprAssignShiftRight{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 309,
-							EndLine:   309,
-							StartPos:  5104,
-							EndPos:    5113,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 309,
-								EndLine:   309,
-								StartPos:  5104,
-								EndPos:    5106,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 309,
-									EndLine:   309,
-									StartPos:  5104,
-									EndPos:    5106,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Expr: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 309,
-								EndLine:   309,
-								StartPos:  5111,
-								EndPos:    5113,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 309,
-									EndLine:   309,
-									StartPos:  5111,
-									EndPos:    5113,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 312,
-						EndLine:   312,
-						StartPos:  5118,
-						EndPos:    5130,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 312,
-							EndLine:   312,
-							StartPos:  5118,
-							EndPos:    5128,
-						},
-					},
-					Class: &ast.NameFullyQualified{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 312,
-								EndLine:   312,
-								StartPos:  5122,
-								EndPos:    5126,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 312,
-										EndLine:   312,
-										StartPos:  5123,
-										EndPos:    5126,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 312,
-								EndLine:   312,
-								StartPos:  5126,
-								EndPos:    5128,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 313,
-						EndLine:   313,
-						StartPos:  5152,
-						EndPos:    5156,
-					},
-				},
-				Expr: &ast.ExprPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 313,
-							EndLine:   313,
-							StartPos:  5152,
-							EndPos:    5155,
-						},
-					},
-					Var: &ast.ExprMethodCall{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 313,
-								EndLine:   313,
-								StartPos:  5148,
-								EndPos:    5150,
-							},
-						},
-						Var: &ast.ExprNew{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 313,
-									EndLine:   313,
-									StartPos:  5132,
-									EndPos:    5142,
-								},
-							},
-							Class: &ast.NameFullyQualified{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 313,
-										EndLine:   313,
-										StartPos:  5136,
-										EndPos:    5140,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 313,
-												EndLine:   313,
-												StartPos:  5137,
-												EndPos:    5140,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 313,
-										EndLine:   313,
-										StartPos:  5140,
-										EndPos:    5142,
-									},
-								},
-							},
-						},
-						Method: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 313,
-									EndLine:   313,
-									StartPos:  5145,
-									EndPos:    5148,
-								},
-							},
-							Value: []byte("bar"),
-						},
-						ArgumentList: &ast.ArgumentList{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 313,
-									EndLine:   313,
-									StartPos:  5148,
-									EndPos:    5150,
-								},
-							},
-						},
-					},
-					Property: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 313,
-								EndLine:   313,
-								StartPos:  5152,
-								EndPos:    5155,
-							},
-						},
-						Value: []byte("baz"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 314,
-						EndLine:   314,
-						StartPos:  5173,
-						EndPos:    5176,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 314,
-							EndLine:   314,
-							StartPos:  5173,
-							EndPos:    5174,
-						},
-					},
-					Var: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 314,
-								EndLine:   314,
-								StartPos:  5170,
-								EndPos:    5171,
-							},
-						},
-						Var: &ast.ExprNew{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 314,
-									EndLine:   314,
-									StartPos:  5158,
-									EndPos:    5168,
-								},
-							},
-							Class: &ast.NameFullyQualified{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 314,
-										EndLine:   314,
-										StartPos:  5162,
-										EndPos:    5166,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 314,
-												EndLine:   314,
-												StartPos:  5163,
-												EndPos:    5166,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 314,
-										EndLine:   314,
-										StartPos:  5166,
-										EndPos:    5168,
-									},
-								},
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 314,
-									EndLine:   314,
-									StartPos:  5170,
-									EndPos:    5171,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 314,
-								EndLine:   314,
-								StartPos:  5173,
-								EndPos:    5174,
-							},
-						},
-						Value: []byte("0"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 315,
-						EndLine:   315,
-						StartPos:  5197,
-						EndPos:    5200,
-					},
-				},
-				Expr: &ast.ExprMethodCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 315,
-							EndLine:   315,
-							StartPos:  5197,
-							EndPos:    5199,
-						},
-					},
-					Var: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 315,
-								EndLine:   315,
-								StartPos:  5190,
-								EndPos:    5191,
-							},
-						},
-						Var: &ast.ExprNew{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 315,
-									EndLine:   315,
-									StartPos:  5178,
-									EndPos:    5188,
-								},
-							},
-							Class: &ast.NameFullyQualified{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 315,
-										EndLine:   315,
-										StartPos:  5182,
-										EndPos:    5186,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 315,
-												EndLine:   315,
-												StartPos:  5183,
-												EndPos:    5186,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 315,
-										EndLine:   315,
-										StartPos:  5186,
-										EndPos:    5188,
-									},
-								},
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 315,
-									EndLine:   315,
-									StartPos:  5190,
-									EndPos:    5191,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-					Method: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 315,
-								EndLine:   315,
-								StartPos:  5194,
-								EndPos:    5197,
-							},
-						},
-						Value: []byte("bar"),
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 315,
-								EndLine:   315,
-								StartPos:  5197,
-								EndPos:    5199,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 317,
-						EndLine:   317,
-						StartPos:  5202,
-						EndPos:    5219,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 317,
-							EndLine:   317,
-							StartPos:  5202,
-							EndPos:    5218,
-						},
-					},
-					Var: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 317,
-								EndLine:   317,
-								StartPos:  5202,
-								EndPos:    5215,
-							},
-						},
-						Var: &ast.ExprArray{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 317,
-									EndLine:   317,
-									StartPos:  5202,
-									EndPos:    5212,
-								},
-							},
-							Items: []ast.Vertex{
-								&ast.ExprArrayItem{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 317,
-											EndLine:   317,
-											StartPos:  5208,
-											EndPos:    5211,
-										},
-									},
-									Val: &ast.ExprShortArray{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 317,
-												EndLine:   317,
-												StartPos:  5208,
-												EndPos:    5211,
-											},
-										},
-										Items: []ast.Vertex{
-											&ast.ExprArrayItem{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 317,
-														EndLine:   317,
-														StartPos:  5209,
-														EndPos:    5210,
-													},
-												},
-												Val: &ast.ScalarLnumber{
-													Node: ast.Node{
-														Position: &position.Position{
-															StartLine: 317,
-															EndLine:   317,
-															StartPos:  5209,
-															EndPos:    5210,
-														},
-													},
-													Value: []byte("0"),
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 317,
-									EndLine:   317,
-									StartPos:  5213,
-									EndPos:    5214,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 317,
-								EndLine:   317,
-								StartPos:  5216,
-								EndPos:    5217,
-							},
-						},
-						Value: []byte("0"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 318,
-						EndLine:   318,
-						StartPos:  5220,
-						EndPos:    5229,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 318,
-							EndLine:   318,
-							StartPos:  5220,
-							EndPos:    5228,
-						},
-					},
-					Var: &ast.ScalarString{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 318,
-								EndLine:   318,
-								StartPos:  5220,
-								EndPos:    5225,
-							},
-						},
-						Value: []byte("\"foo\""),
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 318,
-								EndLine:   318,
-								StartPos:  5226,
-								EndPos:    5227,
-							},
-						},
-						Value: []byte("0"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 319,
-						EndLine:   319,
-						StartPos:  5230,
-						EndPos:    5237,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 319,
-							EndLine:   319,
-							StartPos:  5230,
-							EndPos:    5236,
-						},
-					},
-					Var: &ast.ExprConstFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 319,
-								EndLine:   319,
-								StartPos:  5230,
-								EndPos:    5233,
-							},
-						},
-						Const: &ast.NameName{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 319,
-									EndLine:   319,
-									StartPos:  5230,
-									EndPos:    5233,
-								},
-							},
-							Parts: []ast.Vertex{
-								&ast.NameNamePart{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 319,
-											EndLine:   319,
-											StartPos:  5230,
-											EndPos:    5233,
-										},
-									},
-									Value: []byte("foo"),
-								},
-							},
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 319,
-								EndLine:   319,
-								StartPos:  5234,
-								EndPos:    5235,
-							},
-						},
-						Value: []byte("0"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 320,
-						EndLine:   320,
-						StartPos:  5238,
-						EndPos:    5250,
-					},
-				},
-				Expr: &ast.ExprClassConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 320,
-							EndLine:   320,
-							StartPos:  5238,
-							EndPos:    5249,
-						},
-					},
-					Class: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 320,
-								EndLine:   320,
-								StartPos:  5238,
-								EndPos:    5244,
-							},
-						},
-						Value: []byte("static"),
-					},
-					ConstantName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 320,
-								EndLine:   320,
-								StartPos:  5246,
-								EndPos:    5249,
-							},
-						},
-						Value: []byte("foo"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 322,
-						EndLine:   322,
-						StartPos:  5252,
-						EndPos:    5261,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 322,
-							EndLine:   322,
-							StartPos:  5252,
-							EndPos:    5260,
-						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 322,
-								EndLine:   322,
-								StartPos:  5256,
-								EndPos:    5260,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 322,
-									EndLine:   322,
-									StartPos:  5256,
-									EndPos:    5260,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 323,
-						EndLine:   323,
-						StartPos:  5262,
-						EndPos:    5277,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 323,
-							EndLine:   323,
-							StartPos:  5262,
-							EndPos:    5276,
-						},
-					},
-					Class: &ast.ExprStaticPropertyFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 323,
-								EndLine:   323,
-								StartPos:  5266,
-								EndPos:    5276,
-							},
-						},
-						Class: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 323,
-									EndLine:   323,
-									StartPos:  5266,
-									EndPos:    5270,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 323,
-										EndLine:   323,
-										StartPos:  5266,
-										EndPos:    5270,
-									},
-								},
-								Value: []byte("$foo"),
-							},
-						},
-						Property: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 323,
-									EndLine:   323,
-									StartPos:  5272,
-									EndPos:    5276,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 323,
-										EndLine:   323,
-										StartPos:  5272,
-										EndPos:    5276,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 324,
-						EndLine:   324,
-						StartPos:  5278,
-						EndPos:    5291,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 324,
-							EndLine:   324,
-							StartPos:  5278,
-							EndPos:    5289,
-						},
-					},
-					Class: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 324,
-								EndLine:   324,
-								StartPos:  5288,
-								EndPos:    5289,
-							},
-						},
-						Var: &ast.ExprPropertyFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 324,
-									EndLine:   324,
-									StartPos:  5286,
-									EndPos:    5289,
-								},
-							},
-							Var: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 324,
-										EndLine:   324,
-										StartPos:  5282,
-										EndPos:    5287,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 324,
-											EndLine:   324,
-											StartPos:  5282,
-											EndPos:    5284,
-										},
-									},
-									Value: []byte("$a"),
-								},
-							},
-							Property: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 324,
-										EndLine:   324,
-										StartPos:  5286,
-										EndPos:    5287,
-									},
-								},
-								Value: []byte("b"),
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 324,
-									EndLine:   324,
-									StartPos:  5288,
-									EndPos:    5289,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 325,
-						EndLine:   325,
-						StartPos:  5292,
-						EndPos:    5324,
-					},
-				},
-				Expr: &ast.ExprNew{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 325,
-							EndLine:   325,
-							StartPos:  5292,
-							EndPos:    5322,
-						},
-					},
-					Class: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 325,
-								EndLine:   325,
-								StartPos:  5321,
-								EndPos:    5322,
-							},
-						},
-						Var: &ast.ExprPropertyFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 325,
-									EndLine:   325,
-									StartPos:  5319,
-									EndPos:    5322,
-								},
-							},
-							Var: &ast.ExprPropertyFetch{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 325,
-										EndLine:   325,
-										StartPos:  5315,
-										EndPos:    5320,
-									},
-								},
-								Var: &ast.ExprArrayDimFetch{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 325,
-											EndLine:   325,
-											StartPos:  5302,
-											EndPos:    5317,
-										},
-									},
-									Var: &ast.ExprPropertyFetch{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 325,
-												EndLine:   325,
-												StartPos:  5300,
-												EndPos:    5312,
-											},
-										},
-										Var: &ast.ExprVariable{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 325,
-													EndLine:   325,
-													StartPos:  5296,
-													EndPos:    5301,
-												},
-											},
-											VarName: &ast.Identifier{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 325,
-														EndLine:   325,
-														StartPos:  5296,
-														EndPos:    5298,
-													},
-												},
-												Value: []byte("$a"),
-											},
-										},
-										Property: &ast.Identifier{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 325,
-													EndLine:   325,
-													StartPos:  5300,
-													EndPos:    5301,
-												},
-											},
-											Value: []byte("b"),
-										},
-									},
-									Dim: &ast.ExprTernary{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 325,
-												EndLine:   325,
-												StartPos:  5302,
-												EndPos:    5312,
-											},
-										},
-										Condition: &ast.ExprVariable{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 325,
-													EndLine:   325,
-													StartPos:  5302,
-													EndPos:    5304,
-												},
-											},
-											VarName: &ast.Identifier{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 325,
-														EndLine:   325,
-														StartPos:  5302,
-														EndPos:    5304,
-													},
-												},
-												Value: []byte("$b"),
-											},
-										},
-										IfFalse: &ast.ExprConstFetch{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 325,
-													EndLine:   325,
-													StartPos:  5308,
-													EndPos:    5312,
-												},
-											},
-											Const: &ast.NameName{
-												Node: ast.Node{
-													Position: &position.Position{
-														StartLine: 325,
-														EndLine:   325,
-														StartPos:  5308,
-														EndPos:    5312,
-													},
-												},
-												Parts: []ast.Vertex{
-													&ast.NameNamePart{
-														Node: ast.Node{
-															Position: &position.Position{
-																StartLine: 325,
-																EndLine:   325,
-																StartPos:  5308,
-																EndPos:    5312,
-															},
-														},
-														Value: []byte("null"),
-													},
-												},
-											},
-										},
-									},
-								},
-								Property: &ast.ExprVariable{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 325,
-											EndLine:   325,
-											StartPos:  5315,
-											EndPos:    5317,
-										},
-									},
-									VarName: &ast.Identifier{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 325,
-												EndLine:   325,
-												StartPos:  5315,
-												EndPos:    5317,
-											},
-										},
-										Value: []byte("$c"),
-									},
-								},
-							},
-							Property: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 325,
-										EndLine:   325,
-										StartPos:  5319,
-										EndPos:    5320,
-									},
-								},
-								Value: []byte("d"),
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 325,
-									EndLine:   325,
-									StartPos:  5321,
-									EndPos:    5322,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 325,
-						EndLine:   325,
-						StartPos:  5324,
-						EndPos:    5343,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 325,
-								EndLine:   325,
-								StartPos:  5331,
-								EndPos:    5342,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 325,
-									EndLine:   325,
-									StartPos:  5331,
-									EndPos:    5333,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 325,
-										EndLine:   325,
-										StartPos:  5331,
-										EndPos:    5333,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 325,
-									EndLine:   325,
-									StartPos:  5336,
-									EndPos:    5342,
-								},
-							},
-							Var: &ast.ExprShortArray{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 325,
-										EndLine:   325,
-										StartPos:  5336,
-										EndPos:    5339,
-									},
-								},
-								Items: []ast.Vertex{
-									&ast.ExprArrayItem{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 325,
-												EndLine:   325,
-												StartPos:  5337,
-												EndPos:    5338,
-											},
-										},
-										Val: &ast.ScalarLnumber{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 325,
-													EndLine:   325,
-													StartPos:  5337,
-													EndPos:    5338,
-												},
-											},
-											Value: []byte("1"),
-										},
-									},
-								},
-							},
-							Dim: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 325,
-										EndLine:   325,
-										StartPos:  5340,
-										EndPos:    5341,
-									},
-								},
-								Value: []byte("0"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 327,
-						EndLine:   327,
-						StartPos:  5345,
-						EndPos:    5360,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 327,
-								EndLine:   327,
-								StartPos:  5352,
-								EndPos:    5359,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 327,
-									EndLine:   327,
-									StartPos:  5352,
-									EndPos:    5354,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 327,
-										EndLine:   327,
-										StartPos:  5352,
-										EndPos:    5354,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBooleanNot{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 327,
-									EndLine:   327,
-									StartPos:  5357,
-									EndPos:    5359,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 327,
-										EndLine:   327,
-										StartPos:  5358,
-										EndPos:    5359,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 328,
-						EndLine:   328,
-						StartPos:  5361,
-						EndPos:    5376,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 328,
-								EndLine:   328,
-								StartPos:  5368,
-								EndPos:    5375,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 328,
-									EndLine:   328,
-									StartPos:  5368,
-									EndPos:    5370,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 328,
-										EndLine:   328,
-										StartPos:  5368,
-										EndPos:    5370,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBitwiseNot{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 328,
-									EndLine:   328,
-									StartPos:  5373,
-									EndPos:    5375,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 328,
-										EndLine:   328,
-										StartPos:  5374,
-										EndPos:    5375,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 329,
-						EndLine:   329,
-						StartPos:  5377,
-						EndPos:    5392,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 329,
-								EndLine:   329,
-								StartPos:  5384,
-								EndPos:    5391,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 329,
-									EndLine:   329,
-									StartPos:  5384,
-									EndPos:    5386,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 329,
-										EndLine:   329,
-										StartPos:  5384,
-										EndPos:    5386,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprUnaryPlus{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 329,
-									EndLine:   329,
-									StartPos:  5389,
-									EndPos:    5391,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 329,
-										EndLine:   329,
-										StartPos:  5390,
-										EndPos:    5391,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 330,
-						EndLine:   330,
-						StartPos:  5393,
-						EndPos:    5408,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 330,
-								EndLine:   330,
-								StartPos:  5400,
-								EndPos:    5407,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 330,
-									EndLine:   330,
-									StartPos:  5400,
-									EndPos:    5402,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 330,
-										EndLine:   330,
-										StartPos:  5400,
-										EndPos:    5402,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprUnaryMinus{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 330,
-									EndLine:   330,
-									StartPos:  5405,
-									EndPos:    5407,
-								},
-							},
-							Expr: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 330,
-										EndLine:   330,
-										StartPos:  5406,
-										EndPos:    5407,
-									},
-								},
-								Value: []byte("1"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 331,
-						EndLine:   331,
-						StartPos:  5409,
-						EndPos:    5425,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 331,
-								EndLine:   331,
-								StartPos:  5416,
-								EndPos:    5423,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 331,
-									EndLine:   331,
-									StartPos:  5416,
-									EndPos:    5418,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 331,
-										EndLine:   331,
-										StartPos:  5416,
-										EndPos:    5418,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 331,
-									EndLine:   331,
-									StartPos:  5422,
-									EndPos:    5423,
-								},
-							},
-							Value: []byte("1"),
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 332,
-						EndLine:   332,
-						StartPos:  5426,
-						EndPos:    5445,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 332,
-								EndLine:   332,
-								StartPos:  5433,
-								EndPos:    5444,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 332,
-									EndLine:   332,
-									StartPos:  5433,
-									EndPos:    5435,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 332,
-										EndLine:   332,
-										StartPos:  5433,
-										EndPos:    5435,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprTernary{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 332,
-									EndLine:   332,
-									StartPos:  5438,
-									EndPos:    5444,
-								},
-							},
-							Condition: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 332,
-										EndLine:   332,
-										StartPos:  5438,
-										EndPos:    5439,
-									},
-								},
-								Value: []byte("1"),
-							},
-							IfFalse: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 332,
-										EndLine:   332,
-										StartPos:  5443,
-										EndPos:    5444,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 333,
-						EndLine:   333,
-						StartPos:  5446,
-						EndPos:    5468,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 333,
-								EndLine:   333,
-								StartPos:  5453,
-								EndPos:    5467,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 333,
-									EndLine:   333,
-									StartPos:  5453,
-									EndPos:    5455,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 333,
-										EndLine:   333,
-										StartPos:  5453,
-										EndPos:    5455,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprTernary{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 333,
-									EndLine:   333,
-									StartPos:  5458,
-									EndPos:    5467,
-								},
-							},
-							Condition: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 333,
-										EndLine:   333,
-										StartPos:  5458,
-										EndPos:    5459,
-									},
-								},
-								Value: []byte("1"),
-							},
-							IfTrue: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 333,
-										EndLine:   333,
-										StartPos:  5462,
-										EndPos:    5463,
-									},
-								},
-								Value: []byte("2"),
-							},
-							IfFalse: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 333,
-										EndLine:   333,
-										StartPos:  5466,
-										EndPos:    5467,
-									},
-								},
-								Value: []byte("3"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 334,
-						EndLine:   334,
-						StartPos:  5469,
-						EndPos:    5487,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 334,
-								EndLine:   334,
-								StartPos:  5476,
-								EndPos:    5486,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 334,
-									EndLine:   334,
-									StartPos:  5476,
-									EndPos:    5478,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 334,
-										EndLine:   334,
-										StartPos:  5476,
-										EndPos:    5478,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryBitwiseAnd{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 334,
-									EndLine:   334,
-									StartPos:  5481,
-									EndPos:    5486,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 334,
-										EndLine:   334,
-										StartPos:  5481,
-										EndPos:    5482,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 334,
-										EndLine:   334,
-										StartPos:  5485,
-										EndPos:    5486,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 335,
-						EndLine:   335,
-						StartPos:  5488,
-						EndPos:    5506,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 335,
-								EndLine:   335,
-								StartPos:  5495,
-								EndPos:    5505,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 335,
-									EndLine:   335,
-									StartPos:  5495,
-									EndPos:    5497,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 335,
-										EndLine:   335,
-										StartPos:  5495,
-										EndPos:    5497,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryBitwiseOr{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 335,
-									EndLine:   335,
-									StartPos:  5500,
-									EndPos:    5505,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 335,
-										EndLine:   335,
-										StartPos:  5500,
-										EndPos:    5501,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 335,
-										EndLine:   335,
-										StartPos:  5504,
-										EndPos:    5505,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 336,
-						EndLine:   336,
-						StartPos:  5507,
-						EndPos:    5525,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 336,
-								EndLine:   336,
-								StartPos:  5514,
-								EndPos:    5524,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 336,
-									EndLine:   336,
-									StartPos:  5514,
-									EndPos:    5516,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 336,
-										EndLine:   336,
-										StartPos:  5514,
-										EndPos:    5516,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryBitwiseXor{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 336,
-									EndLine:   336,
-									StartPos:  5519,
-									EndPos:    5524,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 336,
-										EndLine:   336,
-										StartPos:  5519,
-										EndPos:    5520,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 336,
-										EndLine:   336,
-										StartPos:  5523,
-										EndPos:    5524,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 337,
-						EndLine:   337,
-						StartPos:  5526,
-						EndPos:    5545,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 337,
-								EndLine:   337,
-								StartPos:  5533,
-								EndPos:    5544,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 337,
-									EndLine:   337,
-									StartPos:  5533,
-									EndPos:    5535,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 337,
-										EndLine:   337,
-										StartPos:  5533,
-										EndPos:    5535,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryBooleanAnd{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 337,
-									EndLine:   337,
-									StartPos:  5538,
-									EndPos:    5544,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 337,
-										EndLine:   337,
-										StartPos:  5538,
-										EndPos:    5539,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 337,
-										EndLine:   337,
-										StartPos:  5543,
-										EndPos:    5544,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 338,
-						EndLine:   338,
-						StartPos:  5546,
-						EndPos:    5565,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 338,
-								EndLine:   338,
-								StartPos:  5553,
-								EndPos:    5564,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 338,
-									EndLine:   338,
-									StartPos:  5553,
-									EndPos:    5555,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 338,
-										EndLine:   338,
-										StartPos:  5553,
-										EndPos:    5555,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryBooleanOr{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 338,
-									EndLine:   338,
-									StartPos:  5558,
-									EndPos:    5564,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 338,
-										EndLine:   338,
-										StartPos:  5558,
-										EndPos:    5559,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 338,
-										EndLine:   338,
-										StartPos:  5563,
-										EndPos:    5564,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 339,
-						EndLine:   339,
-						StartPos:  5566,
-						EndPos:    5584,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 339,
-								EndLine:   339,
-								StartPos:  5573,
-								EndPos:    5583,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 339,
-									EndLine:   339,
-									StartPos:  5573,
-									EndPos:    5575,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 339,
-										EndLine:   339,
-										StartPos:  5573,
-										EndPos:    5575,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryConcat{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 339,
-									EndLine:   339,
-									StartPos:  5578,
-									EndPos:    5583,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 339,
-										EndLine:   339,
-										StartPos:  5578,
-										EndPos:    5579,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 339,
-										EndLine:   339,
-										StartPos:  5582,
-										EndPos:    5583,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 340,
-						EndLine:   340,
-						StartPos:  5585,
-						EndPos:    5603,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 340,
-								EndLine:   340,
-								StartPos:  5592,
-								EndPos:    5602,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 340,
-									EndLine:   340,
-									StartPos:  5592,
-									EndPos:    5594,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 340,
-										EndLine:   340,
-										StartPos:  5592,
-										EndPos:    5594,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryDiv{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 340,
-									EndLine:   340,
-									StartPos:  5597,
-									EndPos:    5602,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 340,
-										EndLine:   340,
-										StartPos:  5597,
-										EndPos:    5598,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 340,
-										EndLine:   340,
-										StartPos:  5601,
-										EndPos:    5602,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 341,
-						EndLine:   341,
-						StartPos:  5604,
-						EndPos:    5623,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 341,
-								EndLine:   341,
-								StartPos:  5611,
-								EndPos:    5622,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 341,
-									EndLine:   341,
-									StartPos:  5611,
-									EndPos:    5613,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 341,
-										EndLine:   341,
-										StartPos:  5611,
-										EndPos:    5613,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryEqual{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 341,
-									EndLine:   341,
-									StartPos:  5616,
-									EndPos:    5622,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 341,
-										EndLine:   341,
-										StartPos:  5616,
-										EndPos:    5617,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 341,
-										EndLine:   341,
-										StartPos:  5621,
-										EndPos:    5622,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 342,
-						EndLine:   342,
-						StartPos:  5624,
-						EndPos:    5643,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 342,
-								EndLine:   342,
-								StartPos:  5631,
-								EndPos:    5642,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 342,
-									EndLine:   342,
-									StartPos:  5631,
-									EndPos:    5633,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 342,
-										EndLine:   342,
-										StartPos:  5631,
-										EndPos:    5633,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryGreaterOrEqual{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 342,
-									EndLine:   342,
-									StartPos:  5636,
-									EndPos:    5642,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 342,
-										EndLine:   342,
-										StartPos:  5636,
-										EndPos:    5637,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 342,
-										EndLine:   342,
-										StartPos:  5641,
-										EndPos:    5642,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 343,
-						EndLine:   343,
-						StartPos:  5644,
-						EndPos:    5662,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 343,
-								EndLine:   343,
-								StartPos:  5651,
-								EndPos:    5661,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 343,
-									EndLine:   343,
-									StartPos:  5651,
-									EndPos:    5653,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 343,
-										EndLine:   343,
-										StartPos:  5651,
-										EndPos:    5653,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryGreater{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 343,
-									EndLine:   343,
-									StartPos:  5656,
-									EndPos:    5661,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 343,
-										EndLine:   343,
-										StartPos:  5656,
-										EndPos:    5657,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 343,
-										EndLine:   343,
-										StartPos:  5660,
-										EndPos:    5661,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 344,
-						EndLine:   344,
-						StartPos:  5663,
-						EndPos:    5683,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 344,
-								EndLine:   344,
-								StartPos:  5670,
-								EndPos:    5682,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 344,
-									EndLine:   344,
-									StartPos:  5670,
-									EndPos:    5672,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 344,
-										EndLine:   344,
-										StartPos:  5670,
-										EndPos:    5672,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryIdentical{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 344,
-									EndLine:   344,
-									StartPos:  5675,
-									EndPos:    5682,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 344,
-										EndLine:   344,
-										StartPos:  5675,
-										EndPos:    5676,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 344,
-										EndLine:   344,
-										StartPos:  5681,
-										EndPos:    5682,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 345,
-						EndLine:   345,
-						StartPos:  5684,
-						EndPos:    5704,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 345,
-								EndLine:   345,
-								StartPos:  5691,
-								EndPos:    5703,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 345,
-									EndLine:   345,
-									StartPos:  5691,
-									EndPos:    5693,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 345,
-										EndLine:   345,
-										StartPos:  5691,
-										EndPos:    5693,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryLogicalAnd{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 345,
-									EndLine:   345,
-									StartPos:  5696,
-									EndPos:    5703,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 345,
-										EndLine:   345,
-										StartPos:  5696,
-										EndPos:    5697,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 345,
-										EndLine:   345,
-										StartPos:  5702,
-										EndPos:    5703,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 346,
-						EndLine:   346,
-						StartPos:  5705,
-						EndPos:    5724,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 346,
-								EndLine:   346,
-								StartPos:  5712,
-								EndPos:    5723,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 346,
-									EndLine:   346,
-									StartPos:  5712,
-									EndPos:    5714,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 346,
-										EndLine:   346,
-										StartPos:  5712,
-										EndPos:    5714,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryLogicalOr{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 346,
-									EndLine:   346,
-									StartPos:  5717,
-									EndPos:    5723,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 346,
-										EndLine:   346,
-										StartPos:  5717,
-										EndPos:    5718,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 346,
-										EndLine:   346,
-										StartPos:  5722,
-										EndPos:    5723,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 347,
-						EndLine:   347,
-						StartPos:  5725,
-						EndPos:    5745,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 347,
-								EndLine:   347,
-								StartPos:  5732,
-								EndPos:    5744,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 347,
-									EndLine:   347,
-									StartPos:  5732,
-									EndPos:    5734,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 347,
-										EndLine:   347,
-										StartPos:  5732,
-										EndPos:    5734,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryLogicalXor{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 347,
-									EndLine:   347,
-									StartPos:  5737,
-									EndPos:    5744,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 347,
-										EndLine:   347,
-										StartPos:  5737,
-										EndPos:    5738,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 347,
-										EndLine:   347,
-										StartPos:  5743,
-										EndPos:    5744,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 348,
-						EndLine:   348,
-						StartPos:  5746,
-						EndPos:    5764,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 348,
-								EndLine:   348,
-								StartPos:  5753,
-								EndPos:    5763,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 348,
-									EndLine:   348,
-									StartPos:  5753,
-									EndPos:    5755,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 348,
-										EndLine:   348,
-										StartPos:  5753,
-										EndPos:    5755,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryMinus{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 348,
-									EndLine:   348,
-									StartPos:  5758,
-									EndPos:    5763,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 348,
-										EndLine:   348,
-										StartPos:  5758,
-										EndPos:    5759,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 348,
-										EndLine:   348,
-										StartPos:  5762,
-										EndPos:    5763,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 349,
-						EndLine:   349,
-						StartPos:  5765,
-						EndPos:    5783,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 349,
-								EndLine:   349,
-								StartPos:  5772,
-								EndPos:    5782,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 349,
-									EndLine:   349,
-									StartPos:  5772,
-									EndPos:    5774,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 349,
-										EndLine:   349,
-										StartPos:  5772,
-										EndPos:    5774,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryMod{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 349,
-									EndLine:   349,
-									StartPos:  5777,
-									EndPos:    5782,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 349,
-										EndLine:   349,
-										StartPos:  5777,
-										EndPos:    5778,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 349,
-										EndLine:   349,
-										StartPos:  5781,
-										EndPos:    5782,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 350,
-						EndLine:   350,
-						StartPos:  5784,
-						EndPos:    5802,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 350,
-								EndLine:   350,
-								StartPos:  5791,
-								EndPos:    5801,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 350,
-									EndLine:   350,
-									StartPos:  5791,
-									EndPos:    5793,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 350,
-										EndLine:   350,
-										StartPos:  5791,
-										EndPos:    5793,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryMul{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 350,
-									EndLine:   350,
-									StartPos:  5796,
-									EndPos:    5801,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 350,
-										EndLine:   350,
-										StartPos:  5796,
-										EndPos:    5797,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 350,
-										EndLine:   350,
-										StartPos:  5800,
-										EndPos:    5801,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 351,
-						EndLine:   351,
-						StartPos:  5803,
-						EndPos:    5822,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 351,
-								EndLine:   351,
-								StartPos:  5810,
-								EndPos:    5821,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 351,
-									EndLine:   351,
-									StartPos:  5810,
-									EndPos:    5812,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 351,
-										EndLine:   351,
-										StartPos:  5810,
-										EndPos:    5812,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryNotEqual{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 351,
-									EndLine:   351,
-									StartPos:  5815,
-									EndPos:    5821,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 351,
-										EndLine:   351,
-										StartPos:  5815,
-										EndPos:    5816,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 351,
-										EndLine:   351,
-										StartPos:  5820,
-										EndPos:    5821,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 352,
-						EndLine:   352,
-						StartPos:  5823,
-						EndPos:    5843,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 352,
-								EndLine:   352,
-								StartPos:  5830,
-								EndPos:    5842,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 352,
-									EndLine:   352,
-									StartPos:  5830,
-									EndPos:    5832,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 352,
-										EndLine:   352,
-										StartPos:  5830,
-										EndPos:    5832,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryNotIdentical{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 352,
-									EndLine:   352,
-									StartPos:  5835,
-									EndPos:    5842,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 352,
-										EndLine:   352,
-										StartPos:  5835,
-										EndPos:    5836,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 352,
-										EndLine:   352,
-										StartPos:  5841,
-										EndPos:    5842,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 353,
-						EndLine:   353,
-						StartPos:  5844,
-						EndPos:    5862,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 353,
-								EndLine:   353,
-								StartPos:  5851,
-								EndPos:    5861,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 353,
-									EndLine:   353,
-									StartPos:  5851,
-									EndPos:    5853,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 353,
-										EndLine:   353,
-										StartPos:  5851,
-										EndPos:    5853,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryPlus{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 353,
-									EndLine:   353,
-									StartPos:  5856,
-									EndPos:    5861,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 353,
-										EndLine:   353,
-										StartPos:  5856,
-										EndPos:    5857,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 353,
-										EndLine:   353,
-										StartPos:  5860,
-										EndPos:    5861,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 354,
-						EndLine:   354,
-						StartPos:  5863,
-						EndPos:    5882,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 354,
-								EndLine:   354,
-								StartPos:  5870,
-								EndPos:    5881,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 354,
-									EndLine:   354,
-									StartPos:  5870,
-									EndPos:    5872,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 354,
-										EndLine:   354,
-										StartPos:  5870,
-										EndPos:    5872,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryPow{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 354,
-									EndLine:   354,
-									StartPos:  5875,
-									EndPos:    5881,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 354,
-										EndLine:   354,
-										StartPos:  5875,
-										EndPos:    5876,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 354,
-										EndLine:   354,
-										StartPos:  5880,
-										EndPos:    5881,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 355,
-						EndLine:   355,
-						StartPos:  5883,
-						EndPos:    5902,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 355,
-								EndLine:   355,
-								StartPos:  5890,
-								EndPos:    5901,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 355,
-									EndLine:   355,
-									StartPos:  5890,
-									EndPos:    5892,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 355,
-										EndLine:   355,
-										StartPos:  5890,
-										EndPos:    5892,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryShiftLeft{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 355,
-									EndLine:   355,
-									StartPos:  5895,
-									EndPos:    5901,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 355,
-										EndLine:   355,
-										StartPos:  5895,
-										EndPos:    5896,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 355,
-										EndLine:   355,
-										StartPos:  5900,
-										EndPos:    5901,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 356,
-						EndLine:   356,
-						StartPos:  5903,
-						EndPos:    5922,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 356,
-								EndLine:   356,
-								StartPos:  5910,
-								EndPos:    5921,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 356,
-									EndLine:   356,
-									StartPos:  5910,
-									EndPos:    5912,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 356,
-										EndLine:   356,
-										StartPos:  5910,
-										EndPos:    5912,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinaryShiftRight{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 356,
-									EndLine:   356,
-									StartPos:  5915,
-									EndPos:    5921,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 356,
-										EndLine:   356,
-										StartPos:  5915,
-										EndPos:    5916,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 356,
-										EndLine:   356,
-										StartPos:  5920,
-										EndPos:    5921,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 357,
-						EndLine:   357,
-						StartPos:  5923,
-						EndPos:    5942,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 357,
-								EndLine:   357,
-								StartPos:  5930,
-								EndPos:    5941,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 357,
-									EndLine:   357,
-									StartPos:  5930,
-									EndPos:    5932,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 357,
-										EndLine:   357,
-										StartPos:  5930,
-										EndPos:    5932,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinarySmallerOrEqual{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 357,
-									EndLine:   357,
-									StartPos:  5935,
-									EndPos:    5941,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 357,
-										EndLine:   357,
-										StartPos:  5935,
-										EndPos:    5936,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 357,
-										EndLine:   357,
-										StartPos:  5940,
-										EndPos:    5941,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 358,
-						EndLine:   358,
-						StartPos:  5943,
-						EndPos:    5961,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 358,
-								EndLine:   358,
-								StartPos:  5950,
-								EndPos:    5960,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 358,
-									EndLine:   358,
-									StartPos:  5950,
-									EndPos:    5952,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 358,
-										EndLine:   358,
-										StartPos:  5950,
-										EndPos:    5952,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprBinarySmaller{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 358,
-									EndLine:   358,
-									StartPos:  5955,
-									EndPos:    5960,
-								},
-							},
-							Left: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 358,
-										EndLine:   358,
-										StartPos:  5955,
-										EndPos:    5956,
-									},
-								},
-								Value: []byte("1"),
-							},
-							Right: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 358,
-										EndLine:   358,
-										StartPos:  5959,
-										EndPos:    5960,
-									},
-								},
-								Value: []byte("2"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 359,
-						EndLine:   359,
-						StartPos:  5962,
-						EndPos:    5983,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 359,
-								EndLine:   359,
-								StartPos:  5969,
-								EndPos:    5982,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 359,
-									EndLine:   359,
-									StartPos:  5969,
-									EndPos:    5971,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 359,
-										EndLine:   359,
-										StartPos:  5969,
-										EndPos:    5971,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprClassConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 359,
-									EndLine:   359,
-									StartPos:  5974,
-									EndPos:    5982,
-								},
-							},
-							Class: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 359,
-										EndLine:   359,
-										StartPos:  5974,
-										EndPos:    5977,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 359,
-												EndLine:   359,
-												StartPos:  5974,
-												EndPos:    5977,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-							ConstantName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 359,
-										EndLine:   359,
-										StartPos:  5979,
-										EndPos:    5982,
-									},
-								},
-								Value: []byte("bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 360,
-						EndLine:   360,
-						StartPos:  5984,
-						EndPos:    6007,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 360,
-								EndLine:   360,
-								StartPos:  5991,
-								EndPos:    6006,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 360,
-									EndLine:   360,
-									StartPos:  5991,
-									EndPos:    5993,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 360,
-										EndLine:   360,
-										StartPos:  5991,
-										EndPos:    5993,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprClassConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 360,
-									EndLine:   360,
-									StartPos:  5996,
-									EndPos:    6006,
-								},
-							},
-							Class: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 360,
-										EndLine:   360,
-										StartPos:  5996,
-										EndPos:    5999,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 360,
-												EndLine:   360,
-												StartPos:  5996,
-												EndPos:    5999,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-							ConstantName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 360,
-										EndLine:   360,
-										StartPos:  6001,
-										EndPos:    6006,
-									},
-								},
-								Value: []byte("class"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 361,
-						EndLine:   361,
-						StartPos:  6008,
-						EndPos:    6030,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 361,
-								EndLine:   361,
-								StartPos:  6015,
-								EndPos:    6029,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 361,
-									EndLine:   361,
-									StartPos:  6015,
-									EndPos:    6017,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 361,
-										EndLine:   361,
-										StartPos:  6015,
-										EndPos:    6017,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ScalarMagicConstant{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 361,
-									EndLine:   361,
-									StartPos:  6020,
-									EndPos:    6029,
-								},
-							},
-							Value: []byte("__CLASS__"),
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 362,
-						EndLine:   362,
-						StartPos:  6031,
-						EndPos:    6047,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 362,
-								EndLine:   362,
-								StartPos:  6038,
-								EndPos:    6046,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 362,
-									EndLine:   362,
-									StartPos:  6038,
-									EndPos:    6040,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 362,
-										EndLine:   362,
-										StartPos:  6038,
-										EndPos:    6040,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 362,
-									EndLine:   362,
-									StartPos:  6043,
-									EndPos:    6046,
-								},
-							},
-							Const: &ast.NameName{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 362,
-										EndLine:   362,
-										StartPos:  6043,
-										EndPos:    6046,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 362,
-												EndLine:   362,
-												StartPos:  6043,
-												EndPos:    6046,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 363,
-						EndLine:   363,
-						StartPos:  6048,
-						EndPos:    6074,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 363,
-								EndLine:   363,
-								StartPos:  6055,
-								EndPos:    6073,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 363,
-									EndLine:   363,
-									StartPos:  6055,
-									EndPos:    6057,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 363,
-										EndLine:   363,
-										StartPos:  6055,
-										EndPos:    6057,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 363,
-									EndLine:   363,
-									StartPos:  6060,
-									EndPos:    6073,
-								},
-							},
-							Const: &ast.NameRelative{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 363,
-										EndLine:   363,
-										StartPos:  6060,
-										EndPos:    6073,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 363,
-												EndLine:   363,
-												StartPos:  6070,
-												EndPos:    6073,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 364,
-						EndLine:   364,
-						StartPos:  6075,
-						EndPos:    6092,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 364,
-								EndLine:   364,
-								StartPos:  6082,
-								EndPos:    6091,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 364,
-									EndLine:   364,
-									StartPos:  6082,
-									EndPos:    6084,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 364,
-										EndLine:   364,
-										StartPos:  6082,
-										EndPos:    6084,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprConstFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 364,
-									EndLine:   364,
-									StartPos:  6087,
-									EndPos:    6091,
-								},
-							},
-							Const: &ast.NameFullyQualified{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 364,
-										EndLine:   364,
-										StartPos:  6087,
-										EndPos:    6091,
-									},
-								},
-								Parts: []ast.Vertex{
-									&ast.NameNamePart{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 364,
-												EndLine:   364,
-												StartPos:  6088,
-												EndPos:    6091,
-											},
-										},
-										Value: []byte("Foo"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 365,
-						EndLine:   365,
-						StartPos:  6093,
-						EndPos:    6113,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 365,
-								EndLine:   365,
-								StartPos:  6100,
-								EndPos:    6112,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 365,
-									EndLine:   365,
-									StartPos:  6100,
-									EndPos:    6102,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 365,
-										EndLine:   365,
-										StartPos:  6100,
-										EndPos:    6102,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprArray{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 365,
-									EndLine:   365,
-									StartPos:  6105,
-									EndPos:    6112,
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 366,
-						EndLine:   366,
-						StartPos:  6114,
-						EndPos:    6143,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 366,
-								EndLine:   366,
-								StartPos:  6121,
-								EndPos:    6142,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 366,
-									EndLine:   366,
-									StartPos:  6121,
-									EndPos:    6123,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 366,
-										EndLine:   366,
-										StartPos:  6121,
-										EndPos:    6123,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprArray{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 366,
-									EndLine:   366,
-									StartPos:  6126,
-									EndPos:    6142,
-								},
-							},
-							Items: []ast.Vertex{
-								&ast.ExprArrayItem{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 366,
-											EndLine:   366,
-											StartPos:  6132,
-											EndPos:    6138,
-										},
-									},
-									Key: &ast.ScalarLnumber{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 366,
-												EndLine:   366,
-												StartPos:  6132,
-												EndPos:    6133,
-											},
-										},
-										Value: []byte("1"),
-									},
-									Val: &ast.ScalarLnumber{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 366,
-												EndLine:   366,
-												StartPos:  6137,
-												EndPos:    6138,
-											},
-										},
-										Value: []byte("1"),
-									},
-								},
-								&ast.ExprArrayItem{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 366,
-											EndLine:   366,
-											StartPos:  6140,
-											EndPos:    6141,
-										},
-									},
-									Val: &ast.ScalarLnumber{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 366,
-												EndLine:   366,
-												StartPos:  6140,
-												EndPos:    6141,
-											},
-										},
-										Value: []byte("2"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtStatic{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 367,
-						EndLine:   367,
-						StartPos:  6144,
-						EndPos:    6171,
-					},
-				},
-				Vars: []ast.Vertex{
-					&ast.StmtStaticVar{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 367,
-								EndLine:   367,
-								StartPos:  6151,
-								EndPos:    6170,
-							},
-						},
-						Var: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 367,
-									EndLine:   367,
-									StartPos:  6151,
-									EndPos:    6153,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 367,
-										EndLine:   367,
-										StartPos:  6151,
-										EndPos:    6153,
-									},
-								},
-								Value: []byte("$a"),
-							},
-						},
-						Expr: &ast.ExprArrayDimFetch{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 367,
-									EndLine:   367,
-									StartPos:  6156,
-									EndPos:    6170,
-								},
-							},
-							Var: &ast.ExprShortArray{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 367,
-										EndLine:   367,
-										StartPos:  6156,
-										EndPos:    6167,
-									},
-								},
-								Items: []ast.Vertex{
-									&ast.ExprArrayItem{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 367,
-												EndLine:   367,
-												StartPos:  6157,
-												EndPos:    6158,
-											},
-										},
-										Val: &ast.ScalarLnumber{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 367,
-													EndLine:   367,
-													StartPos:  6157,
-													EndPos:    6158,
-												},
-											},
-											Value: []byte("1"),
-										},
-									},
-									&ast.ExprArrayItem{
-										Node: ast.Node{
-											Position: &position.Position{
-												StartLine: 367,
-												EndLine:   367,
-												StartPos:  6160,
-												EndPos:    6166,
-											},
-										},
-										Key: &ast.ScalarLnumber{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 367,
-													EndLine:   367,
-													StartPos:  6160,
-													EndPos:    6161,
-												},
-											},
-											Value: []byte("2"),
-										},
-										Val: &ast.ScalarLnumber{
-											Node: ast.Node{
-												Position: &position.Position{
-													StartLine: 367,
-													EndLine:   367,
-													StartPos:  6165,
-													EndPos:    6166,
-												},
-											},
-											Value: []byte("2"),
-										},
-									},
-								},
-							},
-							Dim: &ast.ScalarLnumber{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 367,
-										EndLine:   367,
-										StartPos:  6168,
-										EndPos:    6169,
-									},
-								},
-								Value: []byte("0"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtIf{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 369,
-						EndLine:   369,
-						StartPos:  6173,
-						EndPos:    6188,
-					},
-				},
-				Cond: &ast.ExprYield{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 369,
-							EndLine:   369,
-							StartPos:  6177,
-							EndPos:    6184,
-						},
-					},
-					Value: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 369,
-								EndLine:   369,
-								StartPos:  6183,
-								EndPos:    6184,
-							},
-						},
-						Value: []byte("1"),
-					},
-				},
-				Stmt: &ast.StmtStmtList{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 369,
-							EndLine:   369,
-							StartPos:  6186,
-							EndPos:    6188,
-						},
-					},
-					Stmts: []ast.Vertex{},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 370,
-						EndLine:   370,
-						StartPos:  6189,
-						EndPos:    6200,
-					},
-				},
-				Expr: &ast.ExprStaticPropertyFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 370,
-							EndLine:   370,
-							StartPos:  6189,
-							EndPos:    6199,
-						},
-					},
-					Class: &ast.NameName{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 370,
-								EndLine:   370,
-								StartPos:  6189,
-								EndPos:    6192,
-							},
-						},
-						Parts: []ast.Vertex{
-							&ast.NameNamePart{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 370,
-										EndLine:   370,
-										StartPos:  6189,
-										EndPos:    6192,
-									},
-								},
-								Value: []byte("Foo"),
-							},
-						},
-					},
-					Property: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 370,
-								EndLine:   370,
-								StartPos:  6194,
-								EndPos:    6199,
-							},
-						},
-						VarName: &ast.ExprVariable{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 370,
-									EndLine:   370,
-									StartPos:  6195,
-									EndPos:    6199,
-								},
-							},
-							VarName: &ast.Identifier{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 370,
-										EndLine:   370,
-										StartPos:  6195,
-										EndPos:    6199,
-									},
-								},
-								Value: []byte("$bar"),
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 372,
-						EndLine:   372,
-						StartPos:  6202,
-						EndPos:    6209,
-					},
-				},
-				Expr: &ast.ExprFunctionCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 372,
-							EndLine:   372,
-							StartPos:  6202,
-							EndPos:    6208,
-						},
-					},
-					Function: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 372,
-								EndLine:   372,
-								StartPos:  6202,
-								EndPos:    6206,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 372,
-									EndLine:   372,
-									StartPos:  6202,
-									EndPos:    6206,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 372,
-								EndLine:   372,
-								StartPos:  6206,
-								EndPos:    6208,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 373,
-						EndLine:   373,
-						StartPos:  6210,
-						EndPos:    6223,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 373,
-							EndLine:   373,
-							StartPos:  6210,
-							EndPos:    6222,
-						},
-					},
-					Var: &ast.ExprArrayDimFetch{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 373,
-								EndLine:   373,
-								StartPos:  6210,
-								EndPos:    6219,
-							},
-						},
-						Var: &ast.ExprFunctionCall{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 373,
-									EndLine:   373,
-									StartPos:  6210,
-									EndPos:    6216,
-								},
-							},
-							Function: &ast.ExprVariable{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 373,
-										EndLine:   373,
-										StartPos:  6210,
-										EndPos:    6214,
-									},
-								},
-								VarName: &ast.Identifier{
-									Node: ast.Node{
-										Position: &position.Position{
-											StartLine: 373,
-											EndLine:   373,
-											StartPos:  6210,
-											EndPos:    6214,
-										},
-									},
-									Value: []byte("$foo"),
-								},
-							},
-							ArgumentList: &ast.ArgumentList{
-								Node: ast.Node{
-									Position: &position.Position{
-										StartLine: 373,
-										EndLine:   373,
-										StartPos:  6214,
-										EndPos:    6216,
-									},
-								},
-							},
-						},
-						Dim: &ast.ScalarLnumber{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 373,
-									EndLine:   373,
-									StartPos:  6217,
-									EndPos:    6218,
-								},
-							},
-							Value: []byte("0"),
-						},
-					},
-					Dim: &ast.ScalarLnumber{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 373,
-								EndLine:   373,
-								StartPos:  6220,
-								EndPos:    6221,
-							},
-						},
-						Value: []byte("0"),
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 374,
-						EndLine:   374,
-						StartPos:  6224,
-						EndPos:    6231,
-					},
-				},
-				Expr: &ast.ExprArrayDimFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 374,
-							EndLine:   374,
-							StartPos:  6224,
-							EndPos:    6230,
-						},
-					},
-					Var: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 374,
-								EndLine:   374,
-								StartPos:  6224,
-								EndPos:    6226,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 374,
-									EndLine:   374,
-									StartPos:  6224,
-									EndPos:    6226,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-					Dim: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 374,
-								EndLine:   374,
-								StartPos:  6227,
-								EndPos:    6229,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 374,
-									EndLine:   374,
-									StartPos:  6227,
-									EndPos:    6229,
-								},
-							},
-							Value: []byte("$b"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 375,
-						EndLine:   375,
-						StartPos:  6232,
-						EndPos:    6238,
-					},
-				},
-				Expr: &ast.ExprVariable{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 375,
-							EndLine:   375,
-							StartPos:  6232,
-							EndPos:    6237,
-						},
-					},
-					VarName: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 375,
-								EndLine:   375,
-								StartPos:  6234,
-								EndPos:    6236,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 375,
-									EndLine:   375,
-									StartPos:  6234,
-									EndPos:    6236,
-								},
-							},
-							Value: []byte("$a"),
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 376,
-						EndLine:   376,
-						StartPos:  6239,
-						EndPos:    6254,
-					},
-				},
-				Expr: &ast.ExprStaticCall{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 376,
-							EndLine:   376,
-							StartPos:  6239,
-							EndPos:    6253,
-						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 376,
-								EndLine:   376,
-								StartPos:  6239,
-								EndPos:    6243,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 376,
-									EndLine:   376,
-									StartPos:  6239,
-									EndPos:    6243,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					Call: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 376,
-								EndLine:   376,
-								StartPos:  6245,
-								EndPos:    6251,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 376,
-									EndLine:   376,
-									StartPos:  6246,
-									EndPos:    6250,
-								},
-							},
-							Value: []byte("$bar"),
-						},
-					},
-					ArgumentList: &ast.ArgumentList{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 376,
-								EndLine:   376,
-								StartPos:  6251,
-								EndPos:    6253,
-							},
-						},
-					},
-				},
-			},
-			&ast.StmtExpression{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 377,
-						EndLine:   377,
-						StartPos:  6255,
-						EndPos:    6265,
-					},
-				},
-				Expr: &ast.ExprClassConstFetch{
-					Node: ast.Node{
-						Position: &position.Position{
-							StartLine: 377,
-							EndLine:   377,
-							StartPos:  6255,
-							EndPos:    6264,
-						},
-					},
-					Class: &ast.ExprVariable{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 377,
-								EndLine:   377,
-								StartPos:  6255,
-								EndPos:    6259,
-							},
-						},
-						VarName: &ast.Identifier{
-							Node: ast.Node{
-								Position: &position.Position{
-									StartLine: 377,
-									EndLine:   377,
-									StartPos:  6255,
-									EndPos:    6259,
-								},
-							},
-							Value: []byte("$foo"),
-						},
-					},
-					ConstantName: &ast.Identifier{
-						Node: ast.Node{
-							Position: &position.Position{
-								StartLine: 377,
-								EndLine:   377,
-								StartPos:  6261,
-								EndPos:    6264,
-							},
-						},
-						Value: []byte("bar"),
-					},
-				},
-			},
-			&ast.StmtHaltCompiler{
-				Node: ast.Node{
-					Position: &position.Position{
-						StartLine: 379,
-						EndLine:   379,
-						StartPos:  6267,
-						EndPos:    6285,
-					},
-				},
-			},
-		},
-	}
-
-	lexer := scanner.NewLexer([]byte(src), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.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), "5.6", nil)
-	php5parser := php5.NewParser(lexer, nil)
-	php5parser.Parse()
-	actual := php5parser.GetRootNode()
-	traverser.NewDFS(new(visitor.FilterParserNodes)).Traverse(actual)
-	traverser.NewDFS(new(visitor.FilterTokens)).Traverse(actual)
-	assert.DeepEqual(t, expected, actual)
-}
-
-func TestPhp5ControlCharsErrors(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), "5.6", errorHandlerFunc)
-	php5parser := php5.NewParser(lexer, errorHandlerFunc)
-	php5parser.Parse()
-	assert.DeepEqual(t, expected, parserErrors)
-}