Initial refactoring of annotations.

Needed to obsolete GenerationTarget annotation. Currently does not
build.