More work on the dictionary and enumerable nodes.