enlarge intentions availability scope to include catch parameter
Merge cleanup
Groovy annotation applicability checks migrated to TargetType enum