Few names of types changed.
Fix: in groupComputation, using withMany extended the life time of marshalled contexts.
Minor changes
Minor: code cleanup.