Had not been passing index type through for map variables.  Fixed here.
Setting tvar for for map serialization.
Adding separate labels for index and value types.
Actually have to instantiate singleton for map deserializer.
Typos in map serialization test led to calling incorrect method.