Added type parameter to some variables.