Removed forward declarations missed in the BaseSyntaxNode? removal. Removed code and modified names to support two versions of the ast.