Added generic params to def and deftype.