Changed Runner and EventTagger to just add event annotations.