Fix remaining lint by twiddling generics