cosmetic: make actuallyUnify less monolithic