Lots more refactoring of Ship and z0.