Some refactoring of the Dictionary.