Moving back to proper generics.