Also used ZipFile for lazy loading now.

I wrote this 2 months ago but forgot to actually push it :)

It makes a pretty big difference in lazy-loading speed. 

My branch is currently lagging behind, but the patch applied cleanly and all tests pass so it feels safe enough to submit.