Added support for arrays vs slices.