Simplify generics.
Merge pull request #1 from robrix/patch-1

Simplify generics.