Fixed usages of changed AST nodes