more DictField/MapField updates