trying to clean up AST annotation pass