That's pretty much how I think about it. The government should get out of the marriage business altogether and just hand out civil unions to everyone. If some religious folks are going to throw a fit, lets stop using language with religious baggage. If they still want to object, they'll have to do so without using their religion as a shield for their bigotry.