small changes in ModelSetManager (http://legacy.python.org/dev/peps/pep-0324/)