FORGE-765: JavaPlugin new-annotation-type: multi-select @Target ElementTypes

+ a small cleanup commit