[Bug 944068] Revise collection style [r=amirn]
Merge pull request #14171 from EverythingMe/944068-collection-style

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