I would suggest that we don't mix types and change this to always be an array. We would have to update the other place(s) this is getting called.