Update Annotator to 2000a6570 (typed-packaging branch)