Removed calls to Array.wrap