Fix generics highlighting