More improvements to dict format.