Eliminate LeafRefValidation.forEachChoice()