Convert even more raw types to generics