There is a Libertarian solution to the problem.

That is to allow civil unions for any consenting adult couple which
provide those legal privileges and responsibilities currently attached
to marriage.

That only works if all the other parties (that is, everyone who deals
differently with married couples) agree, every time.

So long as different words are used, it's still easy to discriminate.

Jose
--
"Never trust anything that can think for itself, if you can't see where
it keeps its brain." (chapter 10 of book 3 - Harry Potter).
for Email, make the obvious change in the address.