Update Annotator to e528d93b (typed-packaging branch)

Fixes #1219.
Fixes #1227.