Gather all conjuncts of a compound condition side into BooleanAnd/BooleanOr conditional holders
#5810
+156
−35