I changed it to annotatedNode and not annotatedElement since I don't want to confuse it with the Element hierarchy(as there are ways to go from Tree to Element). I can use annotatedElement if you think that will nevertheless be clearer.

Otherwise, changed.