Follow up to r113142; fix incorrect conversion to array (value can be array already)