Rework returned arrays' 0th index to be an array upon return