More work on bug #8313.  I added a type to annotations.  This allows for different things to be annotated.