Update element and controller trees when deleting the other.
Deal with moving/deleting element nodes and elements more correctly -- clean up properly, and don't remove the Element if we're only moving a node around.