Fixed some generics.

As per suggestion in #22.