[PATCH 0/5] Refactor and cleanup of kind specific morph processing