Add'l improvements for #506, add referring object for Collections (can't do for arrays)