Fixed up Annot to be parameterized by ambient kind variables