Add filter2() & rename mapTuple() to map2()