[InstCombine] Use canonical index type in more places

Also fixes an issue with 80cd3e4e
pointed out by Roman Divacky: For one of the occurrences I only
changed the name of the type variable, without actually changing
the type...