Add a Context Types section to parallel the Iterator Types section (uses the same terminology as the 2.5a1 implementation)