Various changes including adding exception prevention to IDictionary.