Fix #433. Refactor overloads away in zipfile stubs