Fix zip subscript in two more files.
Merge branch 'martinal/topic-py3-zip-fix' into next