I'm leaning towards remove the support for arrays completely. My suggestion would be to do that as a separate patch, so we do not have a massive PR.
For now, dealing with array to Criteria in the beginning of the method would be ok IMHO and also would simplify a lot next one.