fixed some missing generics
Merge branch 'regRefactorTake2-ian' of github.com:sanity/quickdt into regRefactorTake2-ian