Refactor annotator a bit.
Refactor annotator a bit.

R=ilevy@chromium.org, xusydoc@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/23496035

git-svn-id: 239fca9b83025a0b6f823aeeca02ba5be3d9fd76@222964 0039d316-1c4b-4281-b951-d872f2087c98

shishkander/recipes-py,luci/recipes-py,shishkander/recipes-py,luci/recipes-py