Update comments in the extension point definitions.

The github diff viewer is very confused on this merge...  It looks much better in beyond compare.

This contains changes being ported from #96