Mod 12544 - zcomix: Use entity_to_row where possible.
Mod 12545 - zcomix: Create functions to reuse code.