Added more parts of missing support for type given as array.
Merge branch 'more-array-type-fixes'