Update annotator: fixes #377, and also bring in 3x speedup in anchoring!