little cleanup for #107

there still seems an issue with civs and unzipting people, I've tried to
find something in the code but everything looked ok outside of these
unrelated things.