Annotator work in progress: tidy code; handle semantic types.