com.sun.tools.javac.comp.Annotate.Annotator is now used for many tasks related to annotations, including validation. The name is therefore confusing and it would be beneficial to change it to something more generic, like Worker.