Update code to reflect module updates.

zipr and org.conman.sys have changed enough to mandate updating
this code.