Continued adding support for explicit generics in invocations
Added some annotations