WIP: changing around Generator and which folds it provides.  Switch over to an IMap instance with key and value.
minor: cleanup