ArrayRef ca accept one element. Simplify code a little bit, also it matches now
coding in the other places of the file.