Annotator work in progress: tidy old code snippets.