Cultural separation of the religious ceremony and the state recognized property and rights merger would help. They technically are already but overreach does seem to generally go in the other direction now. That is to say from the state to the faith instead of from faith to state.
That said the...