[upgrade.collection] Use Generics for collections

Generics finally give type safety to collections, so they should be used.