Make it an array all the time and that's it.