Move extraAnnotations down to the helper-methods section