Stop deep-cloning

We trust the developer. And also we sometines need to pass things by
reference.