- generics refactoring, round 3