Fix $each and mapcall