@sim Of course, one aspect of rectification would be to re-assess how marriage is valued as a social institution at all. Should it be held to be separate from generic contract law, and what terms would be regarded as unconscionable?
You may recall that one of the big debates around the time of the gay marriage wrangling was whether or not the state should be involved in defining marriage at all - and no few people said that it shouldn't.