move over to new collections.MutableMapping format