Fixed bug in generics typing
Partially completed work on improving and testing support for preannoated data.