[mbetter]

I don't know how much it is going to help as you're going to have to wrap the values anyway to get a Map with heterogeneous values.