Leave the comments scope when creating a normal annotation, as per #1101