GIRAPH-465: MapFunctions cleanup (nitay)