Remove all governmental licencing of marriage. Marriage becomes strictly a celebratory or religious union.

By removing all federal, state, and local marriage licencing we would then not have to worry about who married whom. Marriage would become two (or more whatever) people who have agreed to publicly live together, and may have gone though a public recognition ceremony (a wedding) with all attendant rights and responsibility.