Improve support for private dictionaries.