Fixed some more bugs in the handling of generics and arrays in TypeName