map/reduce now function types, not structs (i.e., simpler)