Switch TypeNode to Type everywhere outside the AST