Rename 'annotation' non-terminal to something more clear, add a test case for it.