Fixed: Remove lingering references to i

Refs 75e347e8e3b5a18b15210337d56f7524d0d425dc