Remove all traces of @Repeatable. Rename the annotation data 'aspect' to 'type'.