Follow annotator changes. Fixes #1177.