Clarified a method name.
Fixed some generics shenanigans.