diff --git a/lib/6to5/types/visitor-keys.json b/lib/6to5/types/visitor-keys.json
index aac62dd391..125e91c922 100644
--- a/lib/6to5/types/visitor-keys.json
+++ b/lib/6to5/types/visitor-keys.json
@@ -15,7 +15,6 @@
   "ClassBody":                 ["body"],
   "ClassDeclaration":          ["id", "body", "superClass"],
   "ClassExpression":           ["id", "body", "superClass"],
-  "ClassProperty":             ["key"],
   "ComprehensionBlock":        ["left", "right", "body"],
   "ComprehensionExpression":   ["filter", "blocks", "body"],
   "ConditionalExpression":     ["test", "consequent", "alternate"],
@@ -68,6 +67,40 @@
   "VirtualPropertyExpression": ["object", "property"],
   "WhileStatement":            ["test", "body"],
   "WithStatement":             ["object", "body"],
+  "YieldExpression":           ["argument"],
+
+  "AnyTypeAnnotation":           [],
+  "ArrayTypeAnnotation":         [],
+  "BooleanTypeAnnotation":       [],
+  "ClassProperty":               ["key"],
+  "DeclareClass":                [],
+  "DeclareFunction":             [],
+  "DeclareModule":               [],
+  "DeclareVariable":             [],
+  "FunctionTypeAnnotation":      [],
+  "FunctionTypeParam":           [],
+  "GenericTypeAnnotation":       [],
+  "InterfaceExtends":            [],
+  "InterfaceDeclaration":        [],
+  "IntersectionTypeAnnotation":  [],
+  "NullableTypeAnnotation":      [],
+  "NumberTypeAnnotation":        [],
+  "StringLiteralTypeAnnotation": [],
+  "StringTypeAnnotation":        [],
+  "TupleTypeAnnotation":         [],
+  "TypeofTypeAnnotation":        [],
+  "TypeAlias":                   [],
+  "TypeAnnotation":              [],
+  "TypeParameterDeclaration":    [],
+  "TypeParameterInstantiation":  [],
+  "ObjectTypeAnnotation":        [],
+  "ObjectTypeCallProperty":      [],
+  "ObjectTypeIndexer":           [],
+  "ObjectTypeProperty":          [],
+  "QualifiedTypeIdentifier":     [],
+  "UnionTypeAnnotation":         [],
+  "VoidTypeAnnotation":          [],
+
   "XJSAttribute":              ["name", "value"],
   "XJSClosingElement":         ["name"],
   "XJSElement":                ["openingElement", "closingElement", "children"],
@@ -77,6 +110,5 @@
   "XJSMemberExpression":       ["object", "property"],
   "XJSNamespacedName":         ["namespace", "name"],
   "XJSOpeningElement":         ["name", "attributes"],
-  "XJSSpreadAttribute":        ["argument"],
-  "YieldExpression":           ["argument"]
+  "XJSSpreadAttribute":        ["argument"]
 }