Yet more refactoring, to make AnnotatedXxx classes extend Annotated, to allow for simpler annotation introspection.

11 files changed