WYCS: working through generic type instantiation.
WYCS: instantiation of generic types is now working better I think.