Fix warnings on unparameterized generic types