More work on #38, adding name-handling improvements for arrays