This isn't perfect yet, but we're trying to do this incrementally, and merge whatever we can as early as possible. During this work, I realized that the Simplify method of the exclusive could probably be improved, and possibly receive a better signature. This work will have to happen later.