remove use of MutableMapping, not in Python 2.5