Verify gep uses moving to i64

[lanza]

422ddbb

I didn't really look at why this was happening, just wanted to hammer out all the rebase failures. @sitio-couto could you take a look?