Dictionary refactoring almost done.