Annotation handling improvements
More plumbing of the annotation code into where it will be needed.