Revert "Returned back non-explicit ExactlyOne container"

This reverts commit 68c6717be25c9eba94bfe9a1f9115b34041e97bb.
Fixed predicates labeling