Tweaks to get dictionary building.