improve support for dictionaries with known values