Simplify GenericCollectionTypeResolver
Remove support for Type Varibale (not tested and not required)
Tidy up warning suppression

Tidy up warning suppression in GenericCollectionTypeResolverTest