fixup! changed operators to ANY_OF/SOME_OF to avoid ambiguities