[Bug 944068] Revise collection style [r=amirn]