CON-1795: Use shorthand for arrays