Fixes #378.

However, this introduces many things into Annotator,
might break other stuff.