Mod 12486 - zcomix: Misc cleanup.