Made Annot (some) bind kinds as well as types.

Quite a few associated changes.