Some further cleanup of annotation example. We are getting there.