oops
Maps instead of lists for reified generics
Functions to incrementally add type args to instances
fix some refs to reified types
fix broken Iterable.grouping (though it seems it's not used anymore)