Modernizing Legacy Code with Generics

Systematically introduce generics to old code to reduce runtime branching and improve performance.