Working on Edef - tweak cloning and other behavior