Merge "Move one last caller off ZipString."