Change unlimited map back to a gather/take

Should be the same with less overhead