Work on bug #8313.  Annotations refresh.