Patch attached. I only needed Map and Set -- the others are inferred. I guess this was simpler than I thought. :)

Richard