Don't switch to comment scope on normal annotations. Fixes #1110.