Simplified some generics.

+review REVIEW-5322