obsoleting the annotate level 2 interface

[Arnaud Charlet]

Concerning gvd, we rely on -fullname (aka set annotate 1), not annotate 2,
so this change would be ok with us.

Arno