Yes. I don't think there's a need to change all of them, but it'd be nice to use `i` going forward.