Tweaks to dataSource support for arrays