Include type definitions for generated types

For my strategy of always including type annotations to work,
we need type definitions for generated types like _1 and _2,
or the annotations will refer to an undefined type
This oughta fix it... now just need to fix the type arg printing