Similarly reform all these calls to use array-form