[unrelated] Use more symbolic eAnnotation constants
6 files changed