Handle generic types better, including Task<T>

[darrelbrown]

This fixes all the situations I've seen when the return type is a Task and also handles arrays/lists of value types (like int) better as well.