Update Annotator to 7cd640aa. (Picked some of my bugfixes from upstream.)