Yes, and take religion out of marriage and instead make it a legal decision, as a contract between two people. Religious people can have their own separate ceremonies.
Let 'marriage' be a religious sacrament, like e.g. baptism, no state involvement. If people want to enter into legal contracts with their partner they can form a civil partnership.
