Annotations on annotations.
Fixed composite target types bug.
Other minor corrections.