Nested class of generic class appears in ToC above the generic class

At , the table of contents lists the nested class `HashSet.Enumerator` above the outer class `HashSet`. It would look better if the table of contents listed the outer class above its nested classes.

At however, the table of contents lists the nested class `ActivationContext.ContextForm` below the outer class `ActivationContext`. It thus appears that the problem applies to generic classes only.