Promote MergePotentialsElt and SameTailElt to be regular classes