A bit of refactoring - "generics" is almost completely gone.