Changed makeGenericType to throw ArgumentException rather than InvalidOperationException if baseType is not generic.