Cleanup, modify to return null for an empty array.

Cleanup, modify to return null for an empty array. #2761