More tweaks to DEvMode.
New MasterEntitySet implementation should be done.