Minor changes to arrays in preparation for central equality engine (#6917)