Merge "Fix generic inferred type argument."