ValidityConstraint
We had reached a point where the shenanigans about omitting empty arms are unnecessary.