Rename DylanAnnotator to DylanSyntaxAnnotator.
Hack to deal with some macros for now.