I think we might want to reconsider marriage benefits across the board. They are byproducts of a different age, one where the family/estate was considered to be the primary unit, not individuals. Things such as shared health insurance don't make much sense without a homemaker. Since so many of the legal benefits are based on outdated social norms, why not scrap the whole thing? Marriage can be preserved as a cultural/religious institution, but would carry no government/social subsidies.
[/devil's advocate]