REL-1864: Fixed some raw type warnings.