backwards-compatible introduction of generics
6 files changed