1494 fix ToArray() calls over-used